merge: #24

24: Reorganize classes r=imkiva a=imkiva

bors merge

Co-authored-by: imkiva <[email protected]>

src/main/java/org/aya/intellij/actions/Commenter.kt

@@ -3,7 +3,7 @@ package org.aya.intellij.actions
 import com.intellij.lang.CodeDocumentationAwareCommenterEx
 import com.intellij.psi.PsiComment
 import com.intellij.psi.PsiElement
-import org.aya.intellij.parser.AyaParserDefinition
+import org.aya.intellij.language.AyaParserDefinition
 import org.aya.intellij.psi.concrete.AyaPsiRemark
 
 class Commenter : CodeDocumentationAwareCommenterEx {

src/main/java/org/aya/intellij/actions/FindUsages.java

@@ -3,8 +3,8 @@
 import com.intellij.lang.cacheBuilder.WordsScanner;
 import com.intellij.lang.findUsages.FindUsagesProvider;
 import com.intellij.psi.PsiElement;
-import org.aya.intellij.parser.AyaParserDefinition;
-import org.aya.intellij.parser.AyaWordsScanner;
+import org.aya.intellij.language.AyaParserDefinition;
+import org.aya.intellij.language.AyaWordsScanner;
 import org.aya.intellij.psi.AyaPsiNamedElement;
 import org.aya.intellij.psi.concrete.*;
 import org.jetbrains.annotations.Nls;

src/main/java/org/aya/intellij/actions/ReferenceContributor.java

@@ -7,11 +7,11 @@
 import com.intellij.psi.*;
 import com.intellij.util.ProcessingContext;
 import org.aya.intellij.psi.AyaPsiElement;
+import org.aya.intellij.psi.AyaPsiReference;
 import org.aya.intellij.psi.concrete.AyaPsiAtomBindPattern;
 import org.aya.intellij.psi.concrete.AyaPsiNewArgField;
 import org.aya.intellij.psi.concrete.AyaPsiProjFixId;
 import org.aya.intellij.psi.concrete.AyaPsiRefExpr;
-import org.aya.intellij.psi.ref.AyaPsiReference;
 import org.jetbrains.annotations.NotNull;
 
 /**

src/main/java/org/aya/intellij/actions/SyntaxHighlight.kt

@@ -7,7 +7,7 @@ import com.intellij.openapi.editor.colors.TextAttributesKey
 import com.intellij.openapi.fileTypes.SyntaxHighlighterBase
 import com.intellij.psi.TokenType
 import com.intellij.psi.tree.IElementType
-import org.aya.intellij.parser.AyaParserDefinition
+import org.aya.intellij.language.AyaParserDefinition
 import org.aya.parser.AyaPsiElementTypes
 
 class SyntaxHighlight : SyntaxHighlighterBase() {

src/main/java/org/aya/intellij/lsp/AyaLsp.java → src/main/java/org/aya/intellij/actions/lsp/AyaLsp.java

@@ -1,4 +1,4 @@
-package org.aya.intellij.lsp;
+package org.aya.intellij.actions.lsp;
 
 import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer;
 import com.intellij.openapi.diagnostic.Logger;
@@ -29,10 +29,11 @@
 import org.aya.concrete.stmt.Decl;
 import org.aya.concrete.stmt.Stmt;
 import org.aya.generic.Constants;
+import org.aya.intellij.language.AyaIJParserImpl;
 import org.aya.intellij.psi.AyaPsiElement;
 import org.aya.intellij.psi.AyaPsiFile;
 import org.aya.intellij.psi.AyaPsiNamedElement;
-import org.aya.intellij.psi.ref.AyaPsiReference;
+import org.aya.intellij.psi.AyaPsiReference;
 import org.aya.intellij.service.ProblemService;
 import org.aya.lsp.actions.GotoDefinition;
 import org.aya.lsp.server.AyaLanguageClient;

src/main/java/org/aya/intellij/lsp/AyaStartup.java → src/main/java/org/aya/intellij/actions/lsp/AyaStartup.java

@@ -1,4 +1,4 @@
-package org.aya.intellij.lsp;
+package org.aya.intellij.actions.lsp;
 
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;

src/main/java/org/aya/intellij/lsp/JB.java → src/main/java/org/aya/intellij/actions/lsp/JB.java

@@ -1,4 +1,4 @@
-package org.aya.intellij.lsp;
+package org.aya.intellij.actions.lsp;
 
 import com.intellij.diff.util.LineCol;
 import com.intellij.openapi.project.Project;

src/main/java/org/aya/intellij/run/AyaRunLineMarkerContributor.java → src/main/java/org/aya/intellij/actions/run/AyaRunLineMarkerContributor.java

@@ -1,4 +1,4 @@
-package org.aya.intellij.run;
+package org.aya.intellij.actions.run;
 
 import com.intellij.execution.lineMarker.ExecutorAction;
 import com.intellij.execution.lineMarker.RunLineMarkerContributor;
@@ -8,11 +8,11 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.tree.IElementType;
 import kala.collection.immutable.ImmutableSeq;
-import org.aya.intellij.AyaIcons;
 import org.aya.intellij.psi.AyaPsiFile;
 import org.aya.intellij.psi.concrete.AyaPsiDecl;
 import org.aya.intellij.psi.concrete.AyaPsiDeclNameOrInfix;
 import org.aya.intellij.psi.concrete.AyaPsiPrimName;
+import org.aya.intellij.ui.AyaIcons;
 import org.aya.parser.AyaPsiElementTypes;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

src/main/java/org/aya/intellij/run/TyckRunConfig.java → src/main/java/org/aya/intellij/actions/run/TyckRunConfig.java

@@ -1,4 +1,4 @@
-package org.aya.intellij.run;
+package org.aya.intellij.actions.run;
 
 import com.intellij.execution.ExecutionException;
 import com.intellij.execution.Executor;

src/main/java/org/aya/intellij/run/TyckRunConfigEditorUI.form → src/main/java/org/aya/intellij/actions/run/TyckRunConfigEditorUI.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="org.aya.intellij.run.TyckRunConfigEditorUI">
+<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.aya.intellij.actions.run.TyckRunConfigEditorUI">
   <grid id="27dc6" binding="root" layout-manager="GridLayoutManager" row-count="3" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>

src/main/java/org/aya/intellij/run/TyckRunConfigEditorUI.java → src/main/java/org/aya/intellij/actions/run/TyckRunConfigEditorUI.java

@@ -1,4 +1,4 @@
-package org.aya.intellij.run;
+package org.aya.intellij.actions.run;
 
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.ui.LabeledComponent;

src/main/java/org/aya/intellij/proof/ProofSearch.java → src/main/java/org/aya/intellij/actions/search/ProofSearch.java

@@ -1,4 +1,4 @@
-package org.aya.intellij.proof;
+package org.aya.intellij.actions.search;
 
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.openapi.project.Project;
@@ -10,11 +10,10 @@
 import org.aya.concrete.stmt.QualifiedID;
 import org.aya.core.term.Term;
 import org.aya.generic.util.InterruptException;
-import org.aya.intellij.AyaIcons;
-import org.aya.intellij.actions.SearchEverywhere;
-import org.aya.intellij.lsp.AyaIJParserImpl;
+import org.aya.intellij.language.AyaIJParserImpl;
 import org.aya.intellij.psi.AyaPsiElement;
 import org.aya.intellij.service.DistillerService;
+import org.aya.intellij.ui.AyaIcons;
 import org.aya.ref.DefVar;
 import org.aya.util.distill.DistillerOptions;
 import org.aya.util.error.SourcePos;

src/main/java/org/aya/intellij/proof/ProofSearchUI.kt → src/main/java/org/aya/intellij/actions/search/ProofSearchUI.kt

@@ -1,4 +1,4 @@
-package org.aya.intellij.proof
+package org.aya.intellij.actions.search
 
 import com.intellij.ide.actions.searcheverywhere.FoundItemDescriptor
 import com.intellij.ide.actions.searcheverywhere.SearchEverywhereContributorFactory

src/main/java/org/aya/intellij/actions/SearchEverywhere.java → src/main/java/org/aya/intellij/actions/search/SearchEverywhere.java

@@ -1,4 +1,4 @@
-package org.aya.intellij.actions;
+package org.aya.intellij.actions.search;
 
 import com.intellij.navigation.ChooseByNameContributorEx2;
 import com.intellij.navigation.NavigationItem;
@@ -13,12 +13,12 @@
 import kala.collection.immutable.ImmutableSeq;
 import kala.tuple.Tuple;
 import kala.tuple.Tuple2;
-import org.aya.intellij.AyaFileType;
-import org.aya.intellij.lsp.AyaLsp;
-import org.aya.intellij.lsp.JB;
+import org.aya.intellij.actions.lsp.AyaLsp;
+import org.aya.intellij.actions.lsp.JB;
+import org.aya.intellij.language.AyaFileType;
+import org.aya.intellij.psi.AyaNavItem;
 import org.aya.intellij.psi.AyaPsiFile;
 import org.aya.intellij.psi.AyaPsiGenericDecl;
-import org.aya.intellij.ui.AyaNavItem;
 import org.aya.ref.DefVar;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

src/main/java/org/aya/intellij/inspection/AyaInspection.kt

@@ -6,11 +6,11 @@ import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.psi.PsiElementVisitor
 import com.intellij.util.IncorrectOperationException
 import org.aya.intellij.AyaBundle.message
+import org.aya.intellij.actions.lsp.AyaLsp
 import org.aya.intellij.inspection.error.ErrorInspection
 import org.aya.intellij.inspection.goal.GoalInspection
 import org.aya.intellij.inspection.info.InfoInspection
 import org.aya.intellij.inspection.warning.*
-import org.aya.intellij.lsp.AyaLsp
 
 abstract class AyaInspection : LocalInspectionTool() {
   override fun isEnabledByDefault() = true

src/main/java/org/aya/intellij/inspection/CatchAll.java

@@ -5,8 +5,8 @@
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiFile;
 import kala.collection.SeqView;
-import org.aya.intellij.lsp.AyaLsp;
-import org.aya.intellij.lsp.JB;
+import org.aya.intellij.actions.lsp.AyaLsp;
+import org.aya.intellij.actions.lsp.JB;
 import org.aya.intellij.psi.concrete.AyaPsiVisitor;
 import org.aya.intellij.service.DistillerService;
 import org.aya.util.reporter.Problem;

src/main/java/org/aya/intellij/inspection/error/ErrorInspection.java

@@ -8,10 +8,10 @@
 import com.intellij.psi.PsiFile;
 import kala.collection.SeqView;
 import org.aya.intellij.AyaBundle;
+import org.aya.intellij.actions.lsp.AyaLsp;
+import org.aya.intellij.actions.lsp.JB;
 import org.aya.intellij.inspection.CatchAll;
 import org.aya.intellij.inspection.Jobs;
-import org.aya.intellij.lsp.AyaLsp;
-import org.aya.intellij.lsp.JB;
 import org.aya.intellij.psi.AyaPsiFile;
 import org.aya.intellij.service.DistillerService;
 import org.aya.util.reporter.Problem;

src/main/java/org/aya/intellij/inspection/goal/GoalInspection.kt

@@ -6,8 +6,8 @@ import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.codeInspection.ProblemsHolder
 import com.intellij.openapi.project.Project
 import org.aya.intellij.AyaBundle
+import org.aya.intellij.actions.lsp.AyaLsp
 import org.aya.intellij.inspection.AyaInspection
-import org.aya.intellij.lsp.AyaLsp
 import org.aya.intellij.psi.concrete.AyaPsiHoleExpr
 import org.aya.intellij.psi.concrete.AyaPsiVisitor
 import org.aya.intellij.psi.utils.AyaPsiFactory

src/main/java/org/aya/intellij/inspection/info/InfoInspection.java

@@ -4,8 +4,8 @@
 import com.intellij.psi.PsiFile;
 import kala.collection.SeqView;
 import org.aya.intellij.AyaBundle;
+import org.aya.intellij.actions.lsp.AyaLsp;
 import org.aya.intellij.inspection.CatchAll;
-import org.aya.intellij.lsp.AyaLsp;
 import org.aya.util.reporter.Problem;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/org/aya/intellij/inspection/warning/BadCounterexampleInspection.kt

@@ -4,7 +4,7 @@ import com.intellij.codeInspection.*
 import com.intellij.openapi.project.Project
 import org.aya.concrete.error.BadCounterexampleWarn
 import org.aya.intellij.AyaBundle
-import org.aya.intellij.lsp.AyaLsp
+import org.aya.intellij.actions.lsp.AyaLsp
 import org.aya.intellij.psi.concrete.AyaPsiOpenKw
 import org.aya.intellij.psi.concrete.AyaPsiVisitor
 

src/main/java/org/aya/intellij/inspection/warning/BadModifierInspection.kt

@@ -4,7 +4,7 @@ import com.intellij.codeInspection.*
 import com.intellij.openapi.project.Project
 import org.aya.concrete.error.BadModifierWarn
 import org.aya.intellij.AyaBundle
-import org.aya.intellij.lsp.AyaLsp
+import org.aya.intellij.actions.lsp.AyaLsp
 import org.aya.intellij.psi.concrete.AyaPsiFnModifiers
 import org.aya.intellij.psi.concrete.AyaPsiVisitor
 

src/main/java/org/aya/intellij/inspection/warning/DominationInspection.kt

@@ -3,7 +3,7 @@ package org.aya.intellij.inspection.warning
 import com.intellij.codeInspection.*
 import com.intellij.openapi.project.Project
 import org.aya.intellij.AyaBundle
-import org.aya.intellij.lsp.AyaLsp
+import org.aya.intellij.actions.lsp.AyaLsp
 import org.aya.intellij.psi.AyaPsiElement
 import org.aya.intellij.psi.concrete.AyaPsiBareClause
 import org.aya.intellij.psi.concrete.AyaPsiBarredClause

src/main/java/org/aya/intellij/inspection/warning/NamingInspection.kt

@@ -4,7 +4,7 @@ import com.intellij.codeInsight.daemon.impl.quickfix.RenameElementFix
 import com.intellij.codeInspection.ProblemHighlightType
 import com.intellij.codeInspection.ProblemsHolder
 import org.aya.intellij.AyaBundle
-import org.aya.intellij.lsp.AyaLsp
+import org.aya.intellij.actions.lsp.AyaLsp
 import org.aya.intellij.psi.AyaPsiElement
 import org.aya.intellij.psi.AyaPsiNamedElement
 import org.aya.intellij.psi.concrete.AyaPsiVisitor

src/main/java/org/aya/intellij/inspection/warning/WarningInspection.java

@@ -4,9 +4,9 @@
 import com.intellij.psi.PsiFile;
 import kala.collection.SeqView;
 import org.aya.intellij.AyaBundle;
+import org.aya.intellij.actions.lsp.AyaLsp;
 import org.aya.intellij.inspection.CatchAll;
 import org.aya.intellij.inspection.Jobs;
-import org.aya.intellij.lsp.AyaLsp;
 import org.aya.util.reporter.Problem;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/org/aya/intellij/lsp/AyaIJParserImpl.java → src/main/java/org/aya/intellij/language/AyaIJParserImpl.java

@@ -1,4 +1,4 @@
-package org.aya.intellij.lsp;
+package org.aya.intellij.language;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.openapi.application.ApplicationManager;
@@ -14,6 +14,7 @@
 import org.aya.concrete.Expr;
 import org.aya.concrete.GenericAyaParser;
 import org.aya.concrete.stmt.Stmt;
+import org.aya.intellij.actions.lsp.JB;
 import org.aya.intellij.psi.AyaPsiElement;
 import org.aya.intellij.psi.AyaPsiFile;
 import org.aya.intellij.psi.utils.AyaPsiFactory;

src/main/java/org/aya/intellij/parser/AyaNamesValidator.java → src/main/java/org/aya/intellij/language/AyaNamesValidator.java

@@ -1,4 +1,4 @@
-package org.aya.intellij.parser;
+package org.aya.intellij.language;
 
 import com.intellij.lang.refactoring.NamesValidator;
 import com.intellij.openapi.project.Project;

src/main/java/org/aya/intellij/parser/AyaParserDefinition.java → src/main/java/org/aya/intellij/language/AyaParserDefinition.java

@@ -1,4 +1,4 @@
-package org.aya.intellij.parser;
+package org.aya.intellij.language;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lexer.FlexAdapter;

src/main/java/org/aya/intellij/parser/AyaWordsScanner.java → src/main/java/org/aya/intellij/language/AyaWordsScanner.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.aya.intellij.parser;
+package org.aya.intellij.language;
 
 import com.intellij.lang.cacheBuilder.VersionedWordsScanner;
 import com.intellij.lang.cacheBuilder.WordOccurrence;

src/main/java/org/aya/intellij/language.kt → src/main/java/org/aya/intellij/language/language.kt

@@ -1,7 +1,8 @@
-package org.aya.intellij
+package org.aya.intellij.language
 
 import com.intellij.openapi.fileTypes.LanguageFileType
 import org.aya.generic.Constants
+import org.aya.intellij.ui.AyaIcons
 import org.aya.parser.AyaLanguage
 
 object AyaFileType : LanguageFileType(AyaLanguage.INSTANCE) {

src/main/java/org/aya/intellij/ui/utils.kt → src/main/java/org/aya/intellij/psi/AyaNavItem.kt

@@ -1,8 +1,7 @@
-package org.aya.intellij.ui
+package org.aya.intellij.psi
 
 import com.intellij.navigation.NavigationItem
 import com.intellij.pom.Navigatable
-import org.aya.intellij.psi.AyaPsiElement
 
 /**
  * Provide flexible (the verbose flag) presentation control over psi elements.

src/main/java/org/aya/intellij/psi/AyaPsiElement.java

@@ -6,8 +6,8 @@
 import kala.collection.SeqView;
 import kala.collection.immutable.ImmutableSeq;
 import org.aya.concrete.stmt.QualifiedID;
-import org.aya.intellij.AyaIcons;
 import org.aya.intellij.psi.concrete.*;
+import org.aya.intellij.ui.AyaIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

src/main/java/org/aya/intellij/psi/AyaPsiFile.java

@@ -7,7 +7,7 @@
 import com.intellij.psi.FileViewProvider;
 import kala.collection.SeqView;
 import kala.collection.immutable.ImmutableSeq;
-import org.aya.intellij.AyaFileType;
+import org.aya.intellij.language.AyaFileType;
 import org.aya.parser.AyaLanguage;
 import org.jetbrains.annotations.NotNull;
 

src/main/java/org/aya/intellij/psi/AyaPsiNamedElement.java

@@ -2,7 +2,7 @@
 
 import com.intellij.psi.PsiNameIdentifierOwner;
 import org.aya.concrete.stmt.QualifiedID;
-import org.aya.intellij.lsp.AyaLsp;
+import org.aya.intellij.actions.lsp.AyaLsp;
 import org.aya.lsp.utils.ModuleVar;
 import org.aya.ref.DefVar;
 import org.aya.ref.LocalVar;

src/main/java/org/aya/intellij/psi/ref/AyaPsiReference.java → src/main/java/org/aya/intellij/psi/AyaPsiReference.java

@@ -1,14 +1,12 @@
-package org.aya.intellij.psi.ref;
+package org.aya.intellij.psi;
 
 import com.intellij.openapi.util.NlsSafe;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReferenceBase;
 import com.intellij.util.IncorrectOperationException;
 import org.aya.intellij.actions.ReferenceContributor;
-import org.aya.intellij.lsp.AyaLsp;
-import org.aya.intellij.psi.AyaPsiElement;
-import org.aya.intellij.psi.AyaPsiNamedElement;
+import org.aya.intellij.actions.lsp.AyaLsp;
 import org.aya.intellij.psi.concrete.AyaPsiAtomBindPattern;
 import org.aya.intellij.psi.concrete.AyaPsiNewArgField;
 import org.aya.intellij.psi.concrete.AyaPsiProjFixId;

src/main/java/org/aya/intellij/AyaIcons.java → src/main/java/org/aya/intellij/ui/AyaIcons.java

@@ -1,4 +1,4 @@
-package org.aya.intellij;
+package org.aya.intellij.ui;
 
 import com.intellij.icons.AllIcons;
 import com.intellij.openapi.util.IconLoader;

src/main/java/org/aya/intellij/ui/settings/AyaColorSettingsPage.java

@@ -6,8 +6,8 @@
 import com.intellij.openapi.options.colors.ColorDescriptor;
 import com.intellij.openapi.options.colors.ColorSettingsPage;
 import com.intellij.openapi.util.NlsContexts;
-import org.aya.intellij.AyaIcons;
 import org.aya.intellij.actions.SyntaxHighlight;
+import org.aya.intellij.ui.AyaIcons;
 import org.aya.parser.AyaLanguage;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

src/main/java/org/aya/intellij/ui/toolwindow/AyaToolWindow.java

@@ -3,8 +3,8 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowFactory;
-import org.aya.intellij.AyaIcons;
 import org.aya.intellij.service.ProblemService;
+import org.aya.intellij.ui.AyaIcons;
 import org.jetbrains.annotations.NotNull;
 
 public class AyaToolWindow implements ToolWindowFactory {