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

make R fields final, if possibly. implement computeConstantValue, which is called when smb tries to use element in 'case'

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-06-20 17:56:59 +04:00
parent 90f753e851
commit cf68871675
6 changed files with 82 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/augment/AndroidLightField.java
+37 -7
View File
@@ -1,30 +1,48 @@
package org.jetbrains.android.augment;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiFile;
import com.intellij.psi.PsiType;
import com.intellij.psi.*;
import com.intellij.psi.impl.PsiClassImplUtil;
import com.intellij.psi.impl.PsiVariableEx;
import com.intellij.psi.impl.light.LightFieldBuilder;
import com.intellij.util.ArrayUtil;
import com.intellij.util.IncorrectOperationException;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
/**
* @author Eugene.Kudelevsky
*/
class AndroidLightField extends LightFieldBuilder {
class AndroidLightField extends LightFieldBuilder implements PsiVariableEx {
private final PsiClass myContext;
private final PsiType myType;
private final Object myConstantValue;
private final boolean myFinal;
public AndroidLightField(@NotNull String name,
@NotNull PsiClass context,
@NotNull PsiType type) {
@NotNull PsiType type,
boolean isFinal,
@Nullable Object constantValue) {
super(name, type, context);
myContext = context;
myType = type;
myConstantValue = constantValue;
myFinal = isFinal;
setContainingClass(context);
final List<String> modifiers = new ArrayList<String>();
modifiers.add(PsiModifier.PUBLIC);
modifiers.add(PsiModifier.STATIC);
if (isFinal) {
modifiers.add(PsiModifier.FINAL);
}
setModifiers(ArrayUtil.toStringArray(modifiers));
}
@Override
@@ -40,6 +58,18 @@ class AndroidLightField extends LightFieldBuilder {
@Override
public PsiElement setName(@NonNls @NotNull String name) throws IncorrectOperationException {
return new AndroidLightField(name, myContext, myType);
final AndroidLightField field = new AndroidLightField(name, myContext, myType, myFinal, myConstantValue);
field.setInitializer(getInitializer());
return field;
}
@Override
public Object computeConstantValue(Set<PsiVariable> visitedVars) {
return computeConstantValue();
}
@Override
public Object computeConstantValue() {
return myConstantValue;
}
}
plugins/android/src/org/jetbrains/android/augment/ManifestInnerClass.java
+2 -2
View File
@@ -44,8 +44,8 @@ abstract class ManifestInnerClass extends AndroidLightClass {
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(getProject());
int i = 0;
for (Pair<String, String> pair : pairs) {
final AndroidLightField field = new AndroidLightField(pair.getFirst(), ManifestInnerClass.this, stringType);
field.setModifiers(PsiModifier.PUBLIC, PsiModifier.STATIC);
final AndroidLightField field =
new AndroidLightField(pair.getFirst(), ManifestInnerClass.this, stringType, true, pair.getSecond());
field.setInitializer(factory.createExpressionFromText("\"" + pair.getSecond() + "\"", field));
result[i++] = field;
}
plugins/android/src/org/jetbrains/android/augment/ResourceTypeClass.java
+7 -2
View File
@@ -1,11 +1,13 @@
package org.jetbrains.android.augment;
import com.android.resources.ResourceType;
import com.intellij.openapi.module.Module;
import com.intellij.psi.*;
import com.intellij.psi.util.CachedValue;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.psi.util.CachedValuesManager;
import com.intellij.psi.util.PsiModificationTracker;
import org.jetbrains.android.compiler.AndroidCompileUtil;
import org.jetbrains.android.facet.AndroidFacet;
import org.jetbrains.android.util.AndroidResourceUtil;
import org.jetbrains.annotations.NotNull;
@@ -43,6 +45,9 @@ class ResourceTypeClass extends AndroidLightClass {
static PsiField[] buildResourceFields(@NotNull AndroidFacet facet,
@NotNull String resClassName,
@NotNull final PsiClass context) {
final Module circularDepLibWithSamePackage = AndroidCompileUtil.findCircularDependencyOnLibraryWithSamePackage(facet);
final boolean generateNonFinalFields = facet.getConfiguration().LIBRARY_PROJECT || circularDepLibWithSamePackage != null;
final PsiElementFactory factory = JavaPsiFacade.getElementFactory(facet.getModule().getProject());
final Collection<String> resNames = facet.getLocalResourceManager().getResourceNames(resClassName);
final PsiField[] result = new PsiField[resNames.size()];
@@ -51,8 +56,8 @@ class ResourceTypeClass extends AndroidLightClass {
final PsiType type = ResourceType.STYLEABLE.getName().equals(resClassName)
? PsiType.INT.createArrayType()
: PsiType.INT;
final AndroidLightField field = new AndroidLightField(AndroidResourceUtil.getFieldNameByResourceName(resName), context, type);
field.setModifiers(PsiModifier.PUBLIC, PsiModifier.STATIC);
final AndroidLightField field = new AndroidLightField(AndroidResourceUtil.getFieldNameByResourceName(resName), context,
type, !generateNonFinalFields, generateNonFinalFields ? null : 0);
field.setInitializer(factory.createExpressionFromText("0", field));
result[i++] = field;
}
plugins/android/testData/dom/resources/JavaHighlighting.java
+10
View File
@@ -1,5 +1,7 @@
package p1.p2;
import java.lang.System;
public class JavaCompletion1 {
public void f() {
int n1 = R.string.my_string;
@@ -9,5 +11,13 @@ public class JavaCompletion1 {
int n5 = R.attr.myAttr1;
n5 = R.attr.myAttr2;
n5 = R.attr.<error>android_text</error>;
switch(n1) {
case R.string.my_string:
System.out.println("abacaba");
break;
default:
break;
}
}
}
plugins/android/testData/libModule/JavaHighlighting.java
+16
View File
@@ -0,0 +1,16 @@
package p1.p2.lib;
import java.lang.System;
public class JavaHighlighting {
public void f(int n) {
int m = R.string.myLibResource;
switch(n) {
case <error>R.string.myLibResource</error>:
System.out.println("aba");
break;
default:
break;
}
}
}
plugins/android/testSrc/org/jetbrains/android/dom/AndroidLibraryProjectTest.java
+10
View File
@@ -141,6 +141,16 @@ public class AndroidLibraryProjectTest extends UsefulTestCase {
myFixture.checkHighlighting(true, true, true);
}
public void testJavaHighlighting() {
createInitialStructure();
myFixture.copyFileToProject(BASE_PATH + "FindUsagesR1.java", "lib/src/p1/p2/lib/R.java");
String to = "lib/src/p1/p2/lib" + getTestName(true) + ".java";
VirtualFile file = myFixture.copyFileToProject(BASE_PATH + getTestName(false) + ".java", to);
myFixture.configureFromExistingVirtualFile(file);
myFixture.doHighlighting();
myFixture.checkHighlighting(true, true, true);
}
private void doRename(final VirtualFile file, final String newName) {
ApplicationManager.getApplication().runWriteAction(new Runnable() {
@Override