Refactoring into better packages that follow standard naming

Author: halirutan

.idea/uiDesigner.xml

@@ -31,9 +31,9 @@
     <internalFileTemplate name="Package"/>
 
     <errorHandler implementation="de.halirutan.mathematica.errorreporting.GitHubErrorReporter"/>
-    <fileTypeFactory implementation="de.halirutan.mathematica.MathematicaFileTypeFactory"/>
+    <fileTypeFactory implementation="de.halirutan.mathematica.file.MathematicaFileTypeFactory"/>
     <lang.parserDefinition language="Mathematica"
-                           implementationClass="de.halirutan.mathematica.parsing.prattparser.MathematicaParserDefinition"/>
+                           implementationClass="de.halirutan.mathematica.lang.parsing.prattparser.MathematicaParserDefinition"/>
 
     <sdkType id="Mathematica Sdk" implementation="de.halirutan.mathematica.sdk.MathematicaSdkType"/>
     <moduleType id="MATHEMATICA_MODULE"
@@ -127,7 +127,7 @@
     <inspectionToolProvider
         implementation="de.halirutan.mathematica.codeinsight.inspections.MathematicaInspectionProvider"/>
 
-    <psi.referenceContributor language="Mathematica" implementation="de.halirutan.mathematica.parsing.psi.MathematicaReferenceContributor"/>
+    <psi.referenceContributor language="Mathematica" implementation="de.halirutan.mathematica.lang.psi.MathematicaReferenceContributor"/>
     <renamePsiElementProcessor implementation="de.halirutan.mathematica.refactoring.MathematicaPsiRenameProcessor"/>
 
     <applicationService serviceInterface="de.halirutan.mathematica.settings.MathematicaSettings" serviceImplementation="de.halirutan.mathematica.settings.MathematicaSettings"/>

resources/META-INF/plugin.xml

@@ -32,7 +32,7 @@
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
-import de.halirutan.mathematica.parsing.MathematicaElementTypes;
+import de.halirutan.mathematica.lang.parsing.MathematicaElementTypes;
 import org.jetbrains.annotations.NotNull;
 
 /**

…ematica/parsing/ParsingBundle.properties …ca/lang/parsing/ParsingBundle.propertiesresources/de/halirutan/mathematica/parsing/ParsingBundle.properties renamed to resources/de/halirutan/mathematica/lang/parsing/ParsingBundle.properties resources/de/halirutan/mathematica/parsing/ParsingBundle.properties renamed to resources/de/halirutan/mathematica/lang/parsing/ParsingBundle.properties

@@ -29,7 +29,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
-import de.halirutan.mathematica.MathematicaIcons;
+import de.halirutan.mathematica.util.MathematicaIcons;
 
 import java.io.File;
 

src/de/halirutan/mathematica/actions/CollapseExpandNamedCharactersHandler.java

@@ -38,7 +38,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiReference;
 import com.intellij.psi.util.PsiTreeUtil;
-import de.halirutan.mathematica.parsing.psi.api.Symbol;
+import de.halirutan.mathematica.lang.psi.api.Symbol;
 
 import java.util.ArrayList;
 import java.util.Collection;

src/de/halirutan/mathematica/actions/CreateMathematicaFile.java

@@ -15,7 +15,7 @@
 import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.psi.formatter.common.AbstractBlock;
-import de.halirutan.mathematica.MathematicaLanguage;
+import de.halirutan.mathematica.lang.MathematicaLanguage;
 import de.halirutan.mathematica.codeinsight.formatter.AbstractMathematicaBlock;
 import de.halirutan.mathematica.codeinsight.formatter.MathematicaFormattingModelBuilder;
 

src/de/halirutan/mathematica/actions/HighlightElementAndReferences.java

@@ -27,7 +27,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.util.ProcessingContext;
 import de.halirutan.mathematica.codeinsight.completion.SymbolInformationProvider.SymbolInformation;
-import de.halirutan.mathematica.parsing.MathematicaElementTypes;
+import de.halirutan.mathematica.lang.parsing.MathematicaElementTypes;
 import de.halirutan.mathematica.settings.MathematicaSettings;
 import org.jetbrains.annotations.NotNull;
 

src/de/halirutan/mathematica/actions/ShowFormattingBlocks.java

@@ -34,7 +34,7 @@
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.util.PsiTreeUtil;
 import de.halirutan.mathematica.codeinsight.completion.SymbolInformationProvider.SymbolInformation;
-import de.halirutan.mathematica.parsing.psi.api.FunctionCall;
+import de.halirutan.mathematica.lang.psi.api.FunctionCall;
 import de.halirutan.mathematica.settings.MathematicaSettings;
 import de.halirutan.mathematica.settings.MathematicaSettings.SmartEnterResult;
 import org.jetbrains.annotations.NotNull;

src/de/halirutan/mathematica/codeinsight/completion/BuiltinFunctionCompletionProvider.java

@@ -29,7 +29,7 @@
 import com.intellij.psi.PsiFile;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.text.StringTokenizer;
-import de.halirutan.mathematica.MathematicaLanguage;
+import de.halirutan.mathematica.lang.MathematicaLanguage;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.regex.Pattern;