Revert "1.3 - Changed package name to group"

This reverts commit 05332f6.
ron-rs · Aug 22, 2020 · a721fb5 · a721fb5
1 parent 05332f6
commit a721fb5
Show file tree

Hide file tree

Showing 26 changed files with 54 additions and 44 deletions.
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ plugins {
     id 'org.jetbrains.intellij' version '0.4.21'
 }
 
-group 'org.ron-rs'
+group 'org.jonahhenriksson'
 version '1.3'
 
 sourceSets.main.java.srcDirs 'src/main/gen'

diff --git a/src/main/gen/org/jonahhenriksson/ron/language/__RONLexer.java b/src/main/gen/org/jonahhenriksson/ron/language/__RONLexer.java
diff --git a/...ellij_ron/language/parser/_RONParser.java → ...ksson/ron/language/parser/_RONParser.java b/...ellij_ron/language/parser/_RONParser.java → ...ksson/ron/language/parser/_RONParser.java
diff --git a/...s/intellij_ron/language/psi/RONTypes.java → ...henriksson/ron/language/psi/RONTypes.java b/...s/intellij_ron/language/psi/RONTypes.java → ...henriksson/ron/language/psi/RONTypes.java
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONBoolImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONBoolImpl.java
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONListImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONListImpl.java
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONMapEntryImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONMapEntryImpl.java
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONMapImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONMapImpl.java
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONNamedFieldImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONNamedFieldImpl.java
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONObjectImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONObjectImpl.java
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONOptionImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONOptionImpl.java
diff --git a/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONValueImpl.java b/src/main/gen/org/jonahhenriksson/ron/language/psi/impl/RONValueImpl.java
diff --git a/.../org/ron_rs/intellij_ron/language/RON.bnf → .../org/jonahhenriksson/ron/language/RON.bnf b/.../org/ron_rs/intellij_ron/language/RON.bnf → .../org/jonahhenriksson/ron/language/RON.bnf
@@ -1,6 +1,6 @@
 {
-    parserClass = "org.ron_rs.intellij_ron.language.parser._RONParser"
-    parserUtilClass = "org.ron_rs.intellij_ron.language.psi.RONParserUtil"
+    parserClass = "org.jonahhenriksson.ron.language.parser._RONParser"
+    parserUtilClass = "org.jonahhenriksson.ron.language.psi.RONParserUtil"
 
     extends = "com.intellij.extapi.psi.ASTWrapperPsiElement"
 
@@ -9,9 +9,9 @@
     psiPackage = "org.jonahhenriksson.ron.language.psi"
     psiImplPackage = "org.jonahhenriksson.ron.language.psi.impl"
 
-    elementTypeHolderClass = "org.ron_rs.intellij_ron.language.psi.RONTypes"
-    elementTypeClass = "org.ron_rs.intellij_ron.language.psi.RONElementType"
-    tokenTypeClass = "org.ron_rs.intellij_ron.language.psi.RONTokenType"
+    elementTypeHolderClass = "org.jonahhenriksson.ron.language.psi.RONTypes"
+    elementTypeClass = "org.jonahhenriksson.ron.language.psi.RONElementType"
+    tokenTypeClass = "org.jonahhenriksson.ron.language.psi.RONTokenType"
 
     psiImplUtilClass = "org.jonahhenriksson.ron.language.psi.impl.RONPsiImplUtil"
 

diff --git a/.../intellij_ron/language/RONCreateFile.java → ...enriksson/ron/language/RONCreateFile.java b/.../intellij_ron/language/RONCreateFile.java → ...enriksson/ron/language/RONCreateFile.java
@@ -1,12 +1,15 @@
-package org.ron_rs.intellij_ron.language;
+package org.jonahhenriksson.ron.language;
 
 import com.intellij.ide.actions.CreateFileFromTemplateAction;
 import com.intellij.ide.actions.CreateFileFromTemplateDialog;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.util.NlsActions;
 import com.intellij.openapi.util.NlsContexts;
 import com.intellij.psi.PsiDirectory;
 import org.jetbrains.annotations.NotNull;
 
+import javax.swing.*;
+
 public class RONCreateFile extends CreateFileFromTemplateAction {
 
     private static final String NAME = "RON File";

diff --git a/...rs/intellij_ron/language/RONFileType.java → ...hhenriksson/ron/language/RONFileType.java b/...rs/intellij_ron/language/RONFileType.java → ...hhenriksson/ron/language/RONFileType.java
@@ -1,4 +1,4 @@
-package org.ron_rs.intellij_ron.language;
+package org.jonahhenriksson.ron.language;
 
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.util.NlsContexts;

diff --git a/...on_rs/intellij_ron/language/RONIcons.java → ...onahhenriksson/ron/language/RONIcons.java b/...on_rs/intellij_ron/language/RONIcons.java → ...onahhenriksson/ron/language/RONIcons.java
@@ -1,4 +1,4 @@
-package org.ron_rs.intellij_ron.language;
+package org.jonahhenriksson.ron.language;
 
 import com.intellij.openapi.util.IconLoader;
 

diff --git a/...rs/intellij_ron/language/RONLanguage.java → ...hhenriksson/ron/language/RONLanguage.java b/...rs/intellij_ron/language/RONLanguage.java → ...hhenriksson/ron/language/RONLanguage.java
@@ -1,4 +1,4 @@
-package org.ron_rs.intellij_ron.language;
+package org.jonahhenriksson.ron.language;
 
 import com.intellij.lang.Language;
 

diff --git a/...ntellij_ron/language/RONLexerAdapter.java → ...riksson/ron/language/RONLexerAdapter.java b/...ntellij_ron/language/RONLexerAdapter.java → ...riksson/ron/language/RONLexerAdapter.java
@@ -1,4 +1,4 @@
-package org.ron_rs.intellij_ron.language;
+package org.jonahhenriksson.ron.language;
 
 import com.intellij.lexer.FlexAdapter;
 

diff --git a/...lij_ron/language/RONParserDefinition.java → ...son/ron/language/RONParserDefinition.java b/...lij_ron/language/RONParserDefinition.java → ...son/ron/language/RONParserDefinition.java
@@ -1,4 +1,4 @@
-package org.ron_rs.intellij_ron.language;
+package org.jonahhenriksson.ron.language;
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.ParserDefinition;
@@ -8,12 +8,14 @@
 import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IFileElementType;
 import com.intellij.psi.tree.TokenSet;
 import org.jetbrains.annotations.NotNull;
-import org.ron_rs.intellij_ron.language.parser._RONParser;
-import org.ron_rs.intellij_ron.language.psi.RONTypes;
-import org.ron_rs.intellij_ron.language.psi.RONFile;
+import org.jonahhenriksson.ron.language.parser._RONParser;
+import org.jonahhenriksson.ron.language.psi.RONElementType;
+import org.jonahhenriksson.ron.language.psi.RONFile;
+import org.jonahhenriksson.ron.language.psi.RONTypes;
 
 public class RONParserDefinition implements ParserDefinition {
     public static final TokenSet COMMENTS = TokenSet.create(RONTypes.COMMENT, RONTypes.BLOCK_COMMENT);

diff --git a/...ij_ron/language/RONSyntaxHighlighter.java → ...on/ron/language/RONSyntaxHighlighter.java b/...ij_ron/language/RONSyntaxHighlighter.java → ...on/ron/language/RONSyntaxHighlighter.java
@@ -1,4 +1,4 @@
-package org.ron_rs.intellij_ron.language;
+package org.jonahhenriksson.ron.language;
 
 import com.intellij.lexer.Lexer;
 import com.intellij.openapi.editor.DefaultLanguageHighlighterColors;
@@ -8,7 +8,7 @@
 import com.intellij.psi.TokenType;
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NotNull;
-import org.ron_rs.intellij_ron.language.psi.RONTypes;
+import org.jonahhenriksson.ron.language.psi.RONTypes;
 
 public class RONSyntaxHighlighter extends SyntaxHighlighterBase {
 

diff --git a/..._rs/intellij_ron/language/__RONLexer.flex → ...ahhenriksson/ron/language/__RONLexer.flex b/..._rs/intellij_ron/language/__RONLexer.flex → ...ahhenriksson/ron/language/__RONLexer.flex
@@ -1,9 +1,11 @@
 package org.jonahhenriksson.ron.language;
 
+import com.intellij.lexer.FlexLexer;
 import com.intellij.psi.tree.IElementType;
 
 import static com.intellij.psi.TokenType.BAD_CHARACTER;
 import static com.intellij.psi.TokenType.WHITE_SPACE;
+import static org.jonahhenriksson.ron.language.psi.RONTypes.*;
 
 %%
 

diff --git a/...llij_ron/language/psi/RONElementType.java → ...sson/ron/language/psi/RONElementType.java b/...llij_ron/language/psi/RONElementType.java → ...sson/ron/language/psi/RONElementType.java
@@ -1,9 +1,9 @@
-package org.ron_rs.intellij_ron.language.psi;
+package org.jonahhenriksson.ron.language.psi;
 
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.ron_rs.intellij_ron.language.RONLanguage;
+import org.jonahhenriksson.ron.language.RONLanguage;
 
 public class RONElementType extends IElementType {
 

diff --git a/...rs/intellij_ron/language/psi/RONFile.java → ...hhenriksson/ron/language/psi/RONFile.java b/...rs/intellij_ron/language/psi/RONFile.java → ...hhenriksson/ron/language/psi/RONFile.java
@@ -1,11 +1,12 @@
-package org.ron_rs.intellij_ron.language.psi;
+package org.jonahhenriksson.ron.language.psi;
 
 import com.intellij.extapi.psi.PsiFileBase;
+import com.intellij.lang.Language;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.psi.FileViewProvider;
 import org.jetbrains.annotations.NotNull;
-import org.ron_rs.intellij_ron.language.RONFileType;
-import org.ron_rs.intellij_ron.language.RONLanguage;
+import org.jonahhenriksson.ron.language.RONFileType;
+import org.jonahhenriksson.ron.language.RONLanguage;
 
 public class RONFile extends PsiFileBase {
     public RONFile(@NotNull FileViewProvider viewProvider) {

diff --git a/...ellij_ron/language/psi/RONParserUtil.java → ...ksson/ron/language/psi/RONParserUtil.java b/...ellij_ron/language/psi/RONParserUtil.java → ...ksson/ron/language/psi/RONParserUtil.java
@@ -1,4 +1,4 @@
-package org.ron_rs.intellij_ron.language.psi;
+package org.jonahhenriksson.ron.language.psi;
 
 import com.intellij.lang.parser.GeneratedParserUtilBase;
 

diff --git a/...tellij_ron/language/psi/RONTokenType.java → ...iksson/ron/language/psi/RONTokenType.java b/...tellij_ron/language/psi/RONTokenType.java → ...iksson/ron/language/psi/RONTokenType.java
@@ -1,9 +1,9 @@
-package org.ron_rs.intellij_ron.language.psi;
+package org.jonahhenriksson.ron.language.psi;
 
 import com.intellij.psi.tree.IElementType;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
-import org.ron_rs.intellij_ron.language.RONLanguage;
+import org.jonahhenriksson.ron.language.RONLanguage;
 
 public class RONTokenType extends IElementType {
 

diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
-    <id>org.ron_rs.intellij_ron</id>
+    <id>org.jonahhenriksson.ron</id>
     <name>RON</name>
-    <vendor>ron_rs</vendor>
+    <vendor>Jonah Henriksson</vendor>
 
     <description><![CDATA[
     Currently adds highlighting support for the RON (Rust Object Notation) data format.
@@ -10,13 +10,13 @@
     <depends>com.intellij.modules.platform</depends>
 
     <extensions defaultExtensionNs="com.intellij">
-        <fileType name="RON file" implementationClass="org.ron_rs.intellij_ron.language.RONFileType" fieldName="INSTANCE" language="RON" extensions="ron" />
-        <lang.parserDefinition language="RON" implementationClass="org.ron_rs.intellij_ron.language.RONParserDefinition"/>
-        <lang.syntaxHighlighter language="RON" implementationClass="org.ron_rs.intellij_ron.language.RONSyntaxHighlighter"/>
+        <fileType name="RON file" implementationClass="org.jonahhenriksson.ron.language.RONFileType" fieldName="INSTANCE" language="RON" extensions="ron" />
+        <lang.parserDefinition language="RON" implementationClass="org.jonahhenriksson.ron.language.RONParserDefinition"/>
+        <lang.syntaxHighlighter language="RON" implementationClass="org.jonahhenriksson.ron.language.RONSyntaxHighlighter"/>
     </extensions>
     <actions>
-        <action id="org.ron_rs.intellij_ron.language.RONCreateFile"
-                class="org.ron_rs.intellij_ron.language.RONCreateFile" text="RON File"
+        <action id="org.jonahhenriksson.ron.language.RONCreateFile"
+                class="org.jonahhenriksson.ron.language.RONCreateFile" text="RON File"
                 description="Create new RON file">
             <add-to-group group-id="NewGroup" anchor="after" relative-to-action="NewFile"/>
         </action>