Rename org.jetbrains.kotlin.plugin -> org.jetbrains.kotlin.idea

This commit is contained in:
Alexander Udalov
2015-01-12 16:29:35 +03:00
parent d4507226a1
commit 17227bb4fe
294 changed files with 553 additions and 567 deletions
@@ -20,7 +20,7 @@ import com.intellij.lang.ASTNode;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.psi.JetElement;
import org.jetbrains.kotlin.psi.JetElementImpl;
@@ -18,7 +18,7 @@ package org.jetbrains.kotlin;
import com.intellij.psi.tree.IElementType;
import com.intellij.psi.tree.IFileElementType;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes;
@@ -50,8 +50,8 @@ import org.jetbrains.kotlin.descriptors.*;
import org.jetbrains.kotlin.diagnostics.Diagnostic;
import org.jetbrains.kotlin.diagnostics.DiagnosticFactory;
import org.jetbrains.kotlin.diagnostics.Errors;
import org.jetbrains.kotlin.idea.MainFunctionDetector;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.plugin.MainFunctionDetector;
import org.jetbrains.kotlin.psi.*;
import org.jetbrains.kotlin.resolve.*;
import org.jetbrains.kotlin.resolve.bindingContextUtil.BindingContextUtilPackage;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.kotlin.plugin;
package org.jetbrains.kotlin.idea;
import com.intellij.openapi.fileTypes.LanguageFileType;
import com.intellij.openapi.util.IconLoader;
@@ -31,7 +31,7 @@ public class JetFileType extends LanguageFileType {
@NotNull
@Override
protected Icon compute() {
return IconLoader.getIcon("/org/jetbrains/kotlin/plugin/icons/kotlin_file.png");
return IconLoader.getIcon("/org/jetbrains/kotlin/idea/icons/kotlin_file.png");
}
};
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.kotlin.plugin;
package org.jetbrains.kotlin.idea;
import com.intellij.lang.Language;
import org.jetbrains.annotations.NotNull;
@@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.jetbrains.kotlin.plugin;
package org.jetbrains.kotlin.idea;
import com.intellij.util.NotNullFunction;
import org.jetbrains.annotations.NotNull;
@@ -25,9 +25,9 @@ import com.intellij.psi.PsiElement;
import com.intellij.psi.tree.ILazyParseableElementType;
import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.kdoc.parser.KDocParser;
import org.jetbrains.kotlin.kdoc.psi.impl.KDocImpl;
import org.jetbrains.kotlin.plugin.JetLanguage;
public interface KDocTokens {
ILazyParseableElementType KDOC = new ILazyParseableElementType("KDoc", JetLanguage.INSTANCE) {
@@ -20,7 +20,7 @@ import com.intellij.extapi.psi.ASTWrapperPsiElement;
import com.intellij.lang.ASTNode;
import com.intellij.lang.Language;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.kotlin.idea.JetLanguage;
public abstract class KDocElementImpl extends ASTWrapperPsiElement {
@NotNull
@@ -20,10 +20,10 @@ import com.intellij.lang.Language;
import com.intellij.psi.impl.source.tree.LazyParseablePsiElement;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.kdoc.lexer.KDocTokens;
import org.jetbrains.kotlin.kdoc.psi.api.KDoc;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.plugin.JetLanguage;
public class KDocImpl extends LazyParseablePsiElement implements KDoc {
public KDocImpl(CharSequence buffer) {
@@ -19,7 +19,7 @@ package org.jetbrains.kotlin.lexer;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.kotlin.idea.JetLanguage;
public class JetToken extends IElementType {
public JetToken(@NotNull @NonNls String debugName) {
@@ -32,9 +32,9 @@ import com.intellij.psi.tree.TokenSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.JetNodeType;
import org.jetbrains.kotlin.JetNodeTypes;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.lexer.JetLexer;
import org.jetbrains.kotlin.lexer.JetTokens;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.kotlin.psi.JetFile;
import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementType;
import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes;
@@ -23,7 +23,7 @@ import com.intellij.psi.impl.source.tree.FileElement
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.tree.IElementType
import com.intellij.testFramework.LightVirtualFile
import org.jetbrains.kotlin.plugin.JetFileType
import org.jetbrains.kotlin.idea.JetFileType
import java.util.HashSet
import com.intellij.openapi.util.Key
import org.jetbrains.kotlin.types.JetType
@@ -25,7 +25,7 @@ import com.intellij.psi.PsiReference;
import com.intellij.psi.PsiReferenceService;
import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.kotlin.idea.JetLanguage;
public class JetElementImpl extends ASTWrapperPsiElement implements JetElement {
public JetElementImpl(@NotNull ASTNode node) {
@@ -24,7 +24,7 @@ import com.intellij.psi.impl.source.resolve.reference.ReferenceProvidersRegistry
import com.intellij.psi.stubs.IStubElementType;
import com.intellij.psi.stubs.StubElement;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementType;
import java.util.Arrays;
@@ -31,9 +31,9 @@ import kotlin.KotlinPackage;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.kotlin.JetNodeTypes;
import org.jetbrains.kotlin.idea.JetFileType;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.name.FqName;
import org.jetbrains.kotlin.plugin.JetFileType;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.kotlin.psi.stubs.KotlinFileStub;
import org.jetbrains.kotlin.psi.stubs.elements.JetPlaceHolderStubElementType;
import org.jetbrains.kotlin.psi.stubs.elements.JetStubElementTypes;
@@ -24,7 +24,7 @@ import com.intellij.psi.util.PsiTreeUtil
import com.intellij.util.LocalTimeCounter
import org.jetbrains.kotlin.resolve.ImportPath
import org.jetbrains.kotlin.lexer.JetKeywordToken
import org.jetbrains.kotlin.plugin.JetFileType
import org.jetbrains.kotlin.idea.JetFileType
import org.jetbrains.kotlin.psi.JetPsiFactory.CallableBuilder.Target
import com.intellij.openapi.util.Key
import java.io.PrintWriter
@@ -28,8 +28,8 @@ import com.intellij.psi.tree.IStubFileElementType;
import com.intellij.util.io.StringRef;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.parsing.JetParser;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.kotlin.psi.stubs.KotlinFileStub;
import org.jetbrains.kotlin.psi.stubs.impl.KotlinFileStubImpl;
@@ -27,7 +27,7 @@ import com.intellij.util.ArrayFactory;
import com.intellij.util.ReflectionUtil;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.plugin.JetLanguage;
import org.jetbrains.kotlin.idea.JetLanguage;
import org.jetbrains.kotlin.psi.JetClassOrObject;
import org.jetbrains.kotlin.psi.JetElementImplStub;
import org.jetbrains.kotlin.psi.JetFunction;