refactor language-impl module - preparing for valhalla

Author: VISTALL

extract/gson-impl/src/main/java/consulo/json/GsonDescriptionByAnotherPsiElementProvider.java

@@ -27,7 +27,7 @@
 import com.intellij.java.language.util.TreeClassChooserFactory;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.RecursionManager;
-import com.intellij.psi.impl.source.PsiImmediateClassType;
+import com.intellij.java.language.impl.psi.impl.source.PsiImmediateClassType;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.java.language.psi.util.InheritanceUtil;
 import com.intellij.java.language.psi.util.TypeConversionUtil;

extract/guava-impl/src/main/java/consulo/java/guava/GuavaLineMarkerProvider.java

@@ -35,7 +35,7 @@
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.PsiImmediateClassType;
+import com.intellij.java.language.impl.psi.impl.source.PsiImmediateClassType;
 import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.psi.search.PsiElementProcessorAdapter;
 import com.intellij.java.indexing.search.searches.AnnotatedMembersSearch;
@@ -46,7 +46,7 @@
 import com.intellij.util.Functions;
 import com.intellij.util.Query;
 import consulo.annotation.access.RequiredReadAction;
-import consulo.java.JavaIcons;
+import consulo.java.language.impl.JavaIcons;
 
 /**
  * @author VISTALL

jam-impl/src/main/java/consulo/java/jam/impl/JamCommonServiceImpl.java

@@ -18,7 +18,7 @@
 
 import jakarta.inject.Singleton;
 
-import com.intellij.ide.highlighter.JavaFileType;
+import com.intellij.java.language.impl.JavaFileType;
 import com.intellij.jam.model.util.JamCommonUtil;
 import com.intellij.java.language.JavaLanguage;
 import com.intellij.psi.PsiElement;

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/JavaLanguageLevelPusher.java

@@ -15,7 +15,7 @@
  */
 package com.intellij.java.analysis.impl;
 
-import com.intellij.ide.highlighter.JavaFileType;
+import com.intellij.java.language.impl.JavaFileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/DefaultInferredAnnotationProvider.java

@@ -11,7 +11,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.PsiMethodImpl;
+import com.intellij.java.language.impl.psi.impl.source.PsiMethodImpl;
 import com.intellij.java.language.psi.util.PsiUtil;
 import com.intellij.util.containers.ContainerUtil;
 import com.siyeh.ig.callMatcher.CallMatcher;

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/JavaPsiEquivalenceUtil.java

@@ -16,9 +16,10 @@
 package com.intellij.java.analysis.impl.codeInsight;
 
 import com.intellij.codeInsight.PsiEquivalenceUtil;
+import com.intellij.java.language.impl.psi.PsiDiamondTypeImpl;
 import com.intellij.java.language.psi.*;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.source.PsiDiamondTypeElementImpl;
+import com.intellij.java.language.impl.psi.impl.source.PsiDiamondTypeElementImpl;
 
 import java.util.Comparator;
 

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/JavaSoftKeywordHighlightingPass.java

@@ -19,7 +19,7 @@
 import com.intellij.codeHighlighting.TextEditorHighlightingPass;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.daemon.impl.UpdateHighlightersUtil;
-import com.intellij.lang.java.lexer.JavaLexer;
+import com.intellij.java.language.impl.lexer.JavaLexer;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.java.language.LanguageLevel;

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/UnusedSymbolUtil.java

@@ -30,15 +30,15 @@
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.FindSuperElementsHelper;
-import com.intellij.psi.impl.source.PsiClassImpl;
+import com.intellij.java.language.impl.psi.impl.FindSuperElementsHelper;
+import com.intellij.java.language.impl.psi.impl.source.PsiClassImpl;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.PsiSearchHelper;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.java.language.psi.util.PropertyUtil;
 import com.intellij.usageView.UsageInfo;
 import com.intellij.util.Processor;
-import consulo.java.psi.augment.JavaEnumAugmentProvider;
+import consulo.java.language.impl.psi.augment.JavaEnumAugmentProvider;
 import consulo.psi.PsiPackage;
 
 import javax.annotation.Nonnull;

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/AnnotationsHighlightUtil.java

@@ -16,7 +16,7 @@
 package com.intellij.java.analysis.impl.codeInsight.daemon.impl.analysis;
 
 import com.intellij.java.language.codeInsight.AnnotationTargetUtil;
-import com.intellij.codeInsight.daemon.JavaErrorBundle;
+import com.intellij.java.language.impl.codeInsight.daemon.JavaErrorBundle;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
 import com.intellij.codeInsight.daemon.impl.quickfix.QuickFixAction;
@@ -29,9 +29,9 @@
 import com.intellij.patterns.ElementPattern;
 import com.intellij.java.language.LanguageLevel;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.PsiImplUtil;
-import com.intellij.psi.impl.source.PsiClassReferenceType;
-import com.intellij.psi.impl.source.PsiImmediateClassType;
+import com.intellij.java.language.impl.psi.impl.PsiImplUtil;
+import com.intellij.java.language.impl.psi.impl.source.PsiClassReferenceType;
+import com.intellij.java.language.impl.psi.impl.source.PsiImmediateClassType;
 import com.intellij.java.language.psi.util.ClassUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.java.language.psi.util.PsiUtil;

java-analysis-impl/src/main/java/com/intellij/java/analysis/impl/codeInsight/daemon/impl/analysis/GenericsHighlightUtil.java

@@ -15,7 +15,7 @@
  */
 package com.intellij.java.analysis.impl.codeInsight.daemon.impl.analysis;
 
-import com.intellij.codeInsight.daemon.JavaErrorBundle;
+import com.intellij.java.language.impl.codeInsight.daemon.JavaErrorBundle;
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.daemon.impl.HighlightInfoType;
 import com.intellij.codeInsight.daemon.impl.analysis.HighlightInfoHolder;
@@ -38,7 +38,7 @@
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.java.language.LanguageLevel;
 import com.intellij.psi.*;
-import com.intellij.psi.impl.PsiClassImplUtil;
+import com.intellij.java.language.impl.psi.impl.PsiClassImplUtil;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.java.language.psi.search.PsiShortNamesCache;
 import com.intellij.psi.search.searches.ReferencesSearch;