MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

moving Java PSI dependencies to core-impl

Browse Source
This commit is contained in:
Dmitry Jemerov
2011-09-22 19:31:42 +02:00
parent e6b187ba11
commit 4718a4ec89
22 changed files with 13 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/psi/filters/ConstructorFilter.java
-3
View File
@@ -15,11 +15,8 @@
*/
package com.intellij.psi.filters;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import org.jdom.Element;
/**
* Created by IntelliJ IDEA.
java/java-impl/src/com/intellij/psi/filters/getters/CastTypeGetter.java
-8
View File
@@ -16,19 +16,11 @@
package com.intellij.psi.filters.getters;
import com.intellij.psi.filters.ContextGetter;
import com.intellij.psi.filters.ClassFilter;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiMethod;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiJavaCodeReferenceElement;
import com.intellij.psi.PsiTypeCastExpression;
import com.intellij.psi.PsiType;
import com.intellij.psi.util.PsiTreeUtil;
import com.intellij.codeInsight.completion.CompletionContext;
import java.util.Set;
import java.util.HashSet;
/**
* Created by IntelliJ IDEA.
* User: ik
java/java-impl/src/com/intellij/psi/impl/PsiElementFactoryImpl.java
+12 -20
View File
@@ -248,7 +248,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
final CodeStyleManager codeStyleManager = CodeStyleManager.getInstance(myManager.getProject());
PsiUtil.setModifierProperty(parameter, PsiModifier.FINAL,
JavaCodeStyleSettingsFacade.getInstance(myManager.getProject()).isGenerateFinalParameters());
markGenerated(parameter);
GeneratedMarkerVisitor.markGenerated(parameter);
parameter = (PsiParameter)JavaCodeStyleManager.getInstance(myManager.getProject()).shortenClassReferences(parameter);
return (PsiParameter)codeStyleManager.reformat(parameter);
}
@@ -572,7 +572,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
if (initializer != null) {
replace(variable.getInitializer(), initializer, text);
}
markGenerated(statement);
GeneratedMarkerVisitor.markGenerated(statement);
return statement;
}
@@ -635,7 +635,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
@Override
public PsiAnnotation createAnnotationFromText(@NotNull final String annotationText, @Nullable final PsiElement context) throws IncorrectOperationException {
final PsiAnnotation psiAnnotation = super.createAnnotationFromText(annotationText, context);
markGenerated(psiAnnotation);
GeneratedMarkerVisitor.markGenerated(psiAnnotation);
return psiAnnotation;
}
@@ -643,7 +643,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
@Override
public PsiCodeBlock createCodeBlockFromText(@NotNull final String text, @Nullable final PsiElement context) throws IncorrectOperationException {
final PsiCodeBlock psiCodeBlock = super.createCodeBlockFromText(text, context);
markGenerated(psiCodeBlock);
GeneratedMarkerVisitor.markGenerated(psiCodeBlock);
return psiCodeBlock;
}
@@ -651,7 +651,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
@Override
public PsiEnumConstant createEnumConstantFromText(@NotNull final String text, @Nullable final PsiElement context) throws IncorrectOperationException {
final PsiEnumConstant enumConstant = super.createEnumConstantFromText(text, context);
markGenerated(enumConstant);
GeneratedMarkerVisitor.markGenerated(enumConstant);
return enumConstant;
}
@@ -659,7 +659,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
@Override
public PsiExpression createExpressionFromText(@NotNull final String text, @Nullable final PsiElement context) throws IncorrectOperationException {
final PsiExpression expression = super.createExpressionFromText(text, context);
markGenerated(expression);
GeneratedMarkerVisitor.markGenerated(expression);
return expression;
}
@@ -667,7 +667,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
@Override
public PsiField createFieldFromText(@NotNull final String text, @Nullable final PsiElement context) throws IncorrectOperationException {
final PsiField psiField = super.createFieldFromText(text, context);
markGenerated(psiField);
GeneratedMarkerVisitor.markGenerated(psiField);
return psiField;
}
@@ -675,7 +675,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
@Override
public PsiParameter createParameterFromText(@NotNull final String text, @Nullable final PsiElement context) throws IncorrectOperationException {
final PsiParameter parameter = super.createParameterFromText(text, context);
markGenerated(parameter);
GeneratedMarkerVisitor.markGenerated(parameter);
return parameter;
}
@@ -683,7 +683,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
@Override
public PsiStatement createStatementFromText(@NotNull final String text, @Nullable final PsiElement context) throws IncorrectOperationException {
final PsiStatement statement = super.createStatementFromText(text, context);
markGenerated(statement);
GeneratedMarkerVisitor.markGenerated(statement);
return statement;
}
@@ -698,25 +698,17 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
public PsiTypeParameter createTypeParameterFromText(@NotNull final String text,
final PsiElement context) throws IncorrectOperationException {
final PsiTypeParameter typeParameter = super.createTypeParameterFromText(text, context);
markGenerated(typeParameter);
GeneratedMarkerVisitor.markGenerated(typeParameter);
return typeParameter;
}
@NotNull
@Override
public PsiElement createWhiteSpaceFromText(@NotNull @NonNls final String text) throws IncorrectOperationException {
final PsiElement whitespace = super.createWhiteSpaceFromText(text);
markGenerated(whitespace);
return whitespace;
}
@NotNull
@Override
public PsiMethod createMethodFromText(@NotNull final String text,
final PsiElement context,
final LanguageLevel level) throws IncorrectOperationException {
final PsiMethod method = super.createMethodFromText(text, context, level);
markGenerated(method);
GeneratedMarkerVisitor.markGenerated(method);
return method;
}
@@ -726,7 +718,7 @@ public class PsiElementFactoryImpl extends PsiJavaParserFacadeImpl implements Ps
@NotNull final String exceptionName,
final PsiElement context) throws IncorrectOperationException {
final PsiCatchSection psiCatchSection = super.createCatchSection(exceptionType, exceptionName, context);
markGenerated(psiCatchSection);
GeneratedMarkerVisitor.markGenerated(psiCatchSection);
return psiCatchSection;
}
platform/core-impl/core-impl.iml
+1
View File
@@ -10,6 +10,7 @@
<orderEntry type="module" module-name="core-api" exported="" />
<orderEntry type="library" name="picocontainer" level="project" />
<orderEntry type="module" module-name="boot" />
<orderEntry type="library" name="Guava" level="project" />
</component>
</module>
platform/lang-impl/src/com/intellij/psi/filters/AndFilter.java → platform/core-impl/src/com/intellij/psi/filters/AndFilter.java
View File
platform/lang-impl/src/com/intellij/psi/filters/ClassFilter.java → platform/core-impl/src/com/intellij/psi/filters/ClassFilter.java
View File
platform/lang-impl/src/com/intellij/psi/filters/NotFilter.java → platform/core-impl/src/com/intellij/psi/filters/NotFilter.java
View File
platform/lang-impl/src/com/intellij/psi/filters/OrFilter.java → platform/core-impl/src/com/intellij/psi/filters/OrFilter.java
View File
platform/lang-impl/src/com/intellij/psi/impl/light/LightElement.java → platform/core-impl/src/com/intellij/psi/impl/light/LightElement.java
View File
platform/lang-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java → platform/core-impl/src/com/intellij/psi/impl/source/resolve/ResolveCache.java
View File
platform/lang-impl/src/com/intellij/psi/impl/source/tree/LazyParseablePsiElement.java → platform/core-impl/src/com/intellij/psi/impl/source/tree/LazyParseablePsiElement.java
View File
platform/lang-impl/src/com/intellij/psi/impl/source/tree/LightTreeUtil.java → platform/core-impl/src/com/intellij/psi/impl/source/tree/LightTreeUtil.java
View File
platform/lang-impl/src/com/intellij/psi/tree/ChildRoleBase.java → platform/core-impl/src/com/intellij/psi/tree/ChildRoleBase.java
View File
platform/lang-impl/src/com/intellij/psi/tree/IErrorCounterReparseableElementType.java → platform/core-impl/src/com/intellij/psi/tree/IErrorCounterReparseableElementType.java
View File
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrLightIdentifier.java
-2
View File
@@ -17,11 +17,9 @@
package org.jetbrains.plugins.groovy.lang.psi.impl.auxiliary;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiElementVisitor;
import com.intellij.psi.PsiManager;
import com.intellij.psi.impl.light.LightElement;
import com.intellij.psi.tree.IElementType;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.GroovyFileType;
import org.jetbrains.plugins.groovy.lang.lexer.GroovyTokenTypes;
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrDynamicImplicitMethod.java
-1
View File
@@ -16,7 +16,6 @@
package org.jetbrains.plugins.groovy.lang.psi.impl.synthetic;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Ref;
import com.intellij.psi.*;
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightParameterListBuilder.java
-1
View File
@@ -18,7 +18,6 @@ package org.jetbrains.plugins.groovy.lang.psi.impl.synthetic;
import com.intellij.lang.Language;
import com.intellij.psi.*;
import com.intellij.psi.impl.light.LightElement;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.lang.psi.GroovyElementVisitor;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.params.GrParameter;
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/LightModifierList.java
-4
View File
@@ -24,10 +24,6 @@ import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.groovy.GroovyFileType;
import java.lang.reflect.Modifier;
import java.util.Collections;
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
/**
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java
-1
View File
@@ -52,7 +52,6 @@ import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.GrListOrMap;
import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifier;
import org.jetbrains.plugins.groovy.lang.psi.api.auxiliary.modifiers.GrModifierList;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.*;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentLabel;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrNamedArgument;
import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrSpreadArgument;
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathFunctionCallImpl.java
-1
View File
@@ -18,7 +18,6 @@ package org.intellij.lang.xpath.psi.impl;
import com.intellij.lang.ASTNode;
import com.intellij.navigation.ItemPresentation;
import com.intellij.navigation.NavigationItem;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.Pair;
import com.intellij.psi.PsiElement;
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/ImplicitModeElement.java
-1
View File
@@ -2,7 +2,6 @@ package org.intellij.lang.xpath.xslt.psi.impl;
import com.intellij.navigation.ItemPresentation;
import com.intellij.navigation.NavigationItem;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.util.IconLoader;
import com.intellij.openapi.util.TextRange;
import com.intellij.pom.Navigatable;
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltElementImpl.java
-1
View File
@@ -20,7 +20,6 @@ import com.intellij.lang.Language;
import com.intellij.navigation.ItemPresentation;
import com.intellij.navigation.NavigationItem;
import com.intellij.navigation.PsiElementNavigationItem;
import com.intellij.openapi.editor.colors.TextAttributesKey;
import com.intellij.openapi.util.Iconable;
import com.intellij.openapi.util.TextRange;
import com.intellij.psi.PsiElement;