Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move plugin in package de.jflex.ide.idea #27

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ build/
out/
gradle/
gradlew
gradle.bat
gradlew.bat

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.intellij.lang.jflex;
package de.jflex.ide.idea;

import com.intellij.lang.Commenter;
import org.jetbrains.annotations.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.intellij.lang.jflex;
package de.jflex.ide.idea;

import com.intellij.lang.ASTNode;
import com.intellij.lang.documentation.DocumentationProvider;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiManager;
import org.intellij.lang.jflex.psi.JFlexMacroDefinition;
import de.jflex.ide.idea.psi.JFlexMacroDefinition;
import org.jetbrains.annotations.Nullable;

import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.intellij.lang.jflex;
package de.jflex.ide.idea;

import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NonNls;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package org.intellij.lang.jflex;
package de.jflex.ide.idea;

import com.intellij.lang.Language;
import com.intellij.psi.TokenType;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.IFileElementType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.intellij.lang.jflex;
package de.jflex.ide.idea;

import com.intellij.lang.cacheBuilder.DefaultWordsScanner;
import com.intellij.lang.cacheBuilder.WordsScanner;
import com.intellij.lang.findUsages.FindUsagesProvider;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiNamedElement;
import org.intellij.lang.jflex.lexer.JFlexMergingLexer;
import org.intellij.lang.jflex.psi.JFlexMacroDefinition;
import org.intellij.lang.jflex.psi.JFlexStateDefinition;
import de.jflex.ide.idea.lexer.JFlexMergingLexer;
import de.jflex.ide.idea.psi.JFlexMacroDefinition;
import de.jflex.ide.idea.psi.JFlexStateDefinition;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.intellij.lang.jflex;
package de.jflex.ide.idea;

import com.intellij.lang.Language;
import com.intellij.openapi.fileTypes.SingleLazyInstanceSyntaxHighlighterFactory;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
import org.intellij.lang.jflex.fileTypes.JFlexSyntaxHighlighter;
import de.jflex.ide.idea.fileTypes.JFlexSyntaxHighlighter;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.intellij.lang.jflex.compiler;
package de.jflex.ide.idea.compiler;

import com.intellij.execution.CantRunException;
import com.intellij.execution.configurations.CommandLineBuilder;
Expand All @@ -14,9 +14,9 @@
import com.intellij.openapi.util.io.StreamUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile;
import org.intellij.lang.jflex.options.JFlexConfigurable;
import org.intellij.lang.jflex.options.JFlexSettings;
import org.intellij.lang.jflex.util.JFlexBundle;
import de.jflex.ide.idea.options.JFlexConfigurable;
import de.jflex.ide.idea.options.JFlexSettings;
import de.jflex.ide.idea.util.JFlexBundle;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.intellij.lang.jflex.compiler;
package de.jflex.ide.idea.compiler;

import com.intellij.openapi.compiler.*;
import com.intellij.openapi.compiler.Compiler;
import org.intellij.lang.jflex.fileTypes.JFlexFileType;
import de.jflex.ide.idea.fileTypes.JFlexFileType;
import org.jetbrains.annotations.NotNull;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.intellij.lang.jflex.compiler;
package de.jflex.ide.idea.compiler;

import java.text.MessageFormat;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.intellij.lang.jflex.compiler;
package de.jflex.ide.idea.compiler;

import com.intellij.compiler.CompilerConfiguration;
import com.intellij.compiler.impl.CompilerUtil;
Expand All @@ -7,7 +7,6 @@
import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.compiler.*;
import com.intellij.openapi.components.ProjectComponent;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.projectRoots.Sdk;
Expand All @@ -19,10 +18,10 @@
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiManager;
import org.intellij.lang.jflex.fileTypes.JFlexFileType;
import org.intellij.lang.jflex.psi.JFlexElement;
import org.intellij.lang.jflex.psi.JFlexPsiFile;
import org.intellij.lang.jflex.util.JFlexBundle;
import de.jflex.ide.idea.psi.JFlexPsiFile;
import de.jflex.ide.idea.fileTypes.JFlexFileType;
import de.jflex.ide.idea.psi.JFlexElement;
import de.jflex.ide.idea.util.JFlexBundle;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.intellij.lang.jflex.editor;
package de.jflex.ide.idea.editor;

import com.intellij.openapi.editor.HighlighterColors;
import com.intellij.openapi.editor.SyntaxHighlighterColors;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
package org.intellij.lang.jflex.editor.colors;
package de.jflex.ide.idea.editor.colors;

import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.fileTypes.SyntaxHighlighter;
import com.intellij.openapi.fileTypes.SyntaxHighlighterFactory;
import com.intellij.openapi.options.colors.AttributesDescriptor;
import com.intellij.openapi.options.colors.ColorDescriptor;
import com.intellij.openapi.options.colors.ColorSettingsPage;
import com.intellij.lang.LanguageParserDefinitions;
import com.intellij.lang.Language;
import org.intellij.lang.jflex.JFlexLanguage;
import org.intellij.lang.jflex.editor.JFlexHighlighterColors;
import org.intellij.lang.jflex.fileTypes.JFlexFileType;
import de.jflex.ide.idea.JFlexLanguage;
import de.jflex.ide.idea.editor.JFlexHighlighterColors;
import de.jflex.ide.idea.fileTypes.JFlexFileType;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.intellij.lang.jflex.fileTypes;
package de.jflex.ide.idea.fileTypes;

import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.util.IconLoader;
import org.intellij.lang.jflex.JFlexLanguage;
import org.intellij.lang.jflex.util.JFlexBundle;
import de.jflex.ide.idea.JFlexLanguage;
import de.jflex.ide.idea.util.JFlexBundle;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.intellij.lang.jflex.fileTypes;
package de.jflex.ide.idea.fileTypes;

import com.intellij.openapi.fileTypes.FileTypeConsumer;
import com.intellij.openapi.fileTypes.FileTypeFactory;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
package org.intellij.lang.jflex.fileTypes;
package de.jflex.ide.idea.fileTypes;

import com.intellij.lexer.Lexer;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.fileTypes.SyntaxHighlighterBase;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.tree.IElementType;
import org.intellij.lang.jflex.JFlexElementType;
import org.intellij.lang.jflex.JFlexElementTypes;
import org.intellij.lang.jflex.editor.JFlexHighlighterColors;
import org.intellij.lang.jflex.lexer.JFlexHighlighterLexer;
import de.jflex.ide.idea.JFlexElementType;
import de.jflex.ide.idea.JFlexElementTypes;
import de.jflex.ide.idea.editor.JFlexHighlighterColors;
import de.jflex.ide.idea.lexer.JFlexHighlighterLexer;
import org.jetbrains.annotations.NotNull;

import java.util.HashMap;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.intellij.lang.jflex.injection;
package de.jflex.ide.idea.injection;

import com.intellij.openapi.util.TextRange;
import com.intellij.psi.LiteralTextEscaper;
import org.intellij.lang.jflex.psi.JFlexJavaCode;
import de.jflex.ide.idea.psi.JFlexJavaCode;
import org.jetbrains.annotations.NotNull;

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package org.intellij.lang.jflex.injection;
package de.jflex.ide.idea.injection;

import com.intellij.lang.StdLanguages;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.InjectedLanguagePlaces;
import com.intellij.psi.LanguageInjector;
import com.intellij.psi.PsiLanguageInjectionHost;
import org.intellij.lang.jflex.options.JFlexSettings;
import org.intellij.lang.jflex.psi.JFlexElement;
import org.intellij.lang.jflex.psi.JFlexJavaCode;
import org.intellij.lang.jflex.psi.JFlexPsiFile;
import de.jflex.ide.idea.psi.JFlexElement;
import de.jflex.ide.idea.psi.JFlexJavaCode;
import de.jflex.ide.idea.psi.JFlexPsiFile;
import de.jflex.ide.idea.options.JFlexSettings;
import org.jetbrains.annotations.NotNull;

public class JFlexJavaInjector implements LanguageInjector {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package org.intellij.lang.jflex.lexer;

import com.intellij.lexer.FlexLexer;
import com.intellij.psi.tree.IElementType;
import org.intellij.lang.jflex.JFlexElementTypes;
import JFlexElementTypes;

%%

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.intellij.lang.jflex.lexer;
package de.jflex.ide.idea.lexer;

/**
* Lexer adapter.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.intellij.lang.jflex.lexer;
package de.jflex.ide.idea.lexer;

import com.intellij.lexer.FlexAdapter;
import com.intellij.lexer.MergingLexerAdapter;
import com.intellij.psi.tree.TokenSet;
import org.intellij.lang.jflex.JFlexElementTypes;
import de.jflex.ide.idea.JFlexElementTypes;

/**
* Created by IntelliJ IDEA.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.intellij.lang.jflex.lexer;
package de.jflex.ide.idea.lexer;

/**
* Lexer adapter.
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.intellij.lang.jflex.options;
package de.jflex.ide.idea.options;

import javax.swing.*;

import com.intellij.openapi.options.Configurable;
import com.intellij.openapi.options.ConfigurationException;
import org.intellij.lang.jflex.util.JFlexBundle;
import de.jflex.ide.idea.util.JFlexBundle;
import org.jetbrains.annotations.Nls;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.Nullable;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
package org.intellij.lang.jflex.options;
package de.jflex.ide.idea.options;

import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.PathManager;
import com.intellij.openapi.components.*;
import com.intellij.util.xmlb.XmlSerializerUtil;
import org.intellij.lang.jflex.util.JFlexBundle;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;

import java.io.File;

Expand Down
Original file line number Diff line number Diff line change
@@ -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.intellij.lang.jflex.options.JFlexSettingsForm">
<form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="de.jflex.ide.idea.options.JFlexSettingsForm">
<grid id="27dc6" binding="formComponent" layout-manager="GridLayoutManager" row-count="4" 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>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.intellij.lang.jflex.options;
package de.jflex.ide.idea.options;

import javax.swing.*;
import java.awt.*;
Expand All @@ -20,7 +20,7 @@
import com.intellij.uiDesigner.core.GridConstraints;
import com.intellij.uiDesigner.core.GridLayoutManager;
import com.intellij.uiDesigner.core.Spacer;
import org.intellij.lang.jflex.util.JFlexBundle;
import de.jflex.ide.idea.util.JFlexBundle;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;

Expand Down Expand Up @@ -131,20 +131,24 @@ public boolean isModified(JFlexSettings state) {
formComponent = new JPanel();
formComponent.setLayout(new GridLayoutManager(5, 2, new Insets(0, 0, 0, 0), -1, -1));
final JLabel label1 = new JLabel();
this.$$$loadLabelText$$$(label1, ResourceBundle.getBundle("org/intellij/lang/jflex/util/JFlexBundle").getString("path.to.jflex"));
this.$$$loadLabelText$$$(label1, ResourceBundle.getBundle(
"de/jflex/ide/idea/util/JFlexBundle").getString("path.to.jflex"));
formComponent.add(label1, new GridConstraints(0, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final Spacer spacer1 = new Spacer();
formComponent.add(spacer1, new GridConstraints(4, 0, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_VERTICAL, 1, GridConstraints.SIZEPOLICY_WANT_GROW, null, null, null, 0, false));
formComponent.add(jFlexHomeTextField, new GridConstraints(0, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final JLabel label2 = new JLabel();
this.$$$loadLabelText$$$(label2, ResourceBundle.getBundle("org/intellij/lang/jflex/util/JFlexBundle").getString("skeleton.file"));
this.$$$loadLabelText$$$(label2, ResourceBundle.getBundle(
"de/jflex/ide/idea/util/JFlexBundle").getString("skeleton.file"));
formComponent.add(label2, new GridConstraints(1, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
formComponent.add(skeletonPathTextField, new GridConstraints(1, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
final JLabel label3 = new JLabel();
this.$$$loadLabelText$$$(label3, ResourceBundle.getBundle("org/intellij/lang/jflex/util/JFlexBundle").getString("command.line.options"));
this.$$$loadLabelText$$$(label3, ResourceBundle.getBundle(
"de/jflex/ide/idea/util/JFlexBundle").getString("command.line.options"));
formComponent.add(label3, new GridConstraints(2, 0, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_FIXED, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
formComponent.add(commandLineOptionsTextField, new GridConstraints(2, 1, 1, 1, GridConstraints.ANCHOR_CENTER, GridConstraints.FILL_HORIZONTAL, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_WANT_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
this.$$$loadButtonText$$$(enabledEmbedJavaCheckBox, ResourceBundle.getBundle("org/intellij/lang/jflex/util/JFlexBundle").getString("enabled.embed.java.code.support"));
this.$$$loadButtonText$$$(enabledEmbedJavaCheckBox, ResourceBundle.getBundle(
"de/jflex/ide/idea/util/JFlexBundle").getString("enabled.embed.java.code.support"));
formComponent.add(enabledEmbedJavaCheckBox, new GridConstraints(3, 1, 1, 1, GridConstraints.ANCHOR_WEST, GridConstraints.FILL_NONE, GridConstraints.SIZEPOLICY_CAN_SHRINK | GridConstraints.SIZEPOLICY_CAN_GROW, GridConstraints.SIZEPOLICY_FIXED, null, null, null, 0, false));
label1.setLabelFor(jFlexHomeTextField);
label2.setLabelFor(skeletonPathTextField);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package org.intellij.lang.jflex.parser;
package de.jflex.ide.idea.parser;

import com.intellij.lang.ASTNode;
import com.intellij.lang.PsiBuilder;
import com.intellij.lang.PsiParser;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.psi.tree.IElementType;
import org.intellij.lang.jflex.JFlexElementTypes;
import org.intellij.lang.jflex.util.JFlexBundle;
import de.jflex.ide.idea.JFlexElementTypes;
import de.jflex.ide.idea.util.JFlexBundle;
import org.jetbrains.annotations.NotNull;

/**
Expand Down
Loading