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

disable android resources line marker provider

Browse Source
This commit is contained in:
Eugene Kudelevsky
2012-02-13 14:04:03 +04:00
parent c6c2219214
commit 3808ec4706
3 changed files with 14 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/META-INF/plugin.xml
+4 -2
View File
@@ -132,8 +132,10 @@
<completion.contributor language="XML" implementationClass="org.jetbrains.android.AndroidCompletionContributor"
id="compositieAttributeValues" order="first"/>
<codeInsight.lineMarkerProvider language="JAVA" implementationClass="org.jetbrains.android.AndroidResourcesLineMarkerProvider"/>
<codeInsight.lineMarkerProvider language="XML" implementationClass="org.jetbrains.android.AndroidResourcesLineMarkerProvider"/>
<!--<codeInsight.lineMarkerProvider language="JAVA" implementationClass="org.jetbrains.android.AndroidResourcesLineMarkerProvider"/>
<codeInsight.lineMarkerProvider language="XML" implementationClass="org.jetbrains.android.AndroidResourcesLineMarkerProvider"/>-->
<renamePsiElementProcessor implementation="org.jetbrains.android.AndroidRenameResourceProcessor" order="first"/>
<intentionAction>
<className>org.jetbrains.android.intentions.AndroidAddStringResourceAction</className>
plugins/android/testSrc/org/jetbrains/android/AndroidResourcesLineMarkerTest.java
+6 -23
View File
@@ -1,29 +1,12 @@
package org.jetbrains.android;
import com.intellij.codeInsight.daemon.GutterIconNavigationHandler;
import com.intellij.codeInsight.daemon.LineMarkerInfo;
import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl;
import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction;
import com.intellij.ide.DataManager;
import com.intellij.openapi.actionSystem.ActionManager;
import com.intellij.openapi.actionSystem.AnActionEvent;
import com.intellij.openapi.actionSystem.DataContext;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiField;
import com.intellij.psi.xml.XmlFile;
import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture;
import org.jetbrains.android.actions.GotoResourceAction;
import java.io.IOException;
import java.util.List;
/**
* @author Eugene.Kudelevsky
*/
public class AndroidResourcesLineMarkerTest extends AndroidTestCase {
private static final String BASE_PATH = "/resNavigation/";
public void test1() {}
/*private static final String BASE_PATH = "/resNavigation/";
public AndroidResourcesLineMarkerTest() {
super(false);
@@ -102,7 +85,7 @@ public class AndroidResourcesLineMarkerTest extends AndroidTestCase {
// do not draw line markers on usages of a resource: AndroidGotoDeclarationHandler provides navigation instead
assertEquals(0, markers.size());
/*for (LineMarkerInfo marker : markers) {
*//*for (LineMarkerInfo marker : markers) {
PsiReferenceExpression expression = (PsiReferenceExpression)marker.getElement();
PsiField field = (PsiField)expression.resolve();
GutterIconNavigationHandler handler = marker.getNavigationHandler();
@@ -110,7 +93,7 @@ public class AndroidResourcesLineMarkerTest extends AndroidTestCase {
Computable<PsiElement[]> targetProvider = ((AndroidResourcesLineMarkerProvider.MyLazyNavigationHandler)handler).getTargetProvider();
PsiElement[] targets = targetProvider.compute();
checkTargets(field, targets);
}*/
}*//*
}
public void testJavaFileNavigation1() throws Exception {
@@ -226,5 +209,5 @@ public class AndroidResourcesLineMarkerTest extends AndroidTestCase {
private void copyRJava() throws IOException {
myFixture.copyFileToProject(BASE_PATH + "src/p1/p2/R.java", "src/p1/p2/R.java");
}
}*/
}
plugins/android/testSrc/org/jetbrains/android/dom/AndroidLibraryProjectTest.java
+4 -11
View File
@@ -2,27 +2,20 @@ package org.jetbrains.android.dom;
import com.android.sdklib.SdkConstants;
import com.intellij.codeInsight.completion.CompletionType;
import com.intellij.codeInsight.daemon.GutterIconNavigationHandler;
import com.intellij.codeInsight.daemon.LineMarkerInfo;
import com.intellij.codeInsight.navigation.actions.GotoDeclarationAction;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.roots.ModifiableRootModel;
import com.intellij.openapi.roots.ModuleRootManager;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.PsiElement;
import com.intellij.psi.PsiField;
import com.intellij.psi.PsiFile;
import com.intellij.psi.xml.XmlFile;
import com.intellij.testFramework.IdeaTestCase;
import com.intellij.testFramework.UsefulTestCase;
import com.intellij.testFramework.builders.JavaModuleFixtureBuilder;
import com.intellij.testFramework.fixtures.*;
import com.intellij.usageView.UsageInfo;
import org.jetbrains.android.AndroidFindUsagesTest;
import org.jetbrains.android.AndroidResourcesLineMarkerProvider;
import org.jetbrains.android.AndroidResourcesLineMarkerTest;
import org.jetbrains.android.AndroidTestCase;
import org.jetbrains.android.facet.AndroidFacet;
import org.jetbrains.android.inspections.AndroidDomInspection;
@@ -193,7 +186,7 @@ public class AndroidLibraryProjectTest extends UsefulTestCase {
myFixture.checkResultByFile(BASE_PATH + getTestName(true) + "_after.xml");
}
public void testRJavaFileMarkers() throws Exception {
/*public void testRJavaFileMarkers() throws Exception {
doTestRJavaFilesMarkers("/app/src/p1/p2/R.java");
}
@@ -228,7 +221,7 @@ public class AndroidLibraryProjectTest extends UsefulTestCase {
List<LineMarkerInfo> markers =
AndroidResourcesLineMarkerTest.collectMarkers(myFixture, BASE_PATH + getTestName(false) + ".java", "/app/src/p1/p2/Java.java");
assertEquals(0, markers.size());
}
}*/
public void testJavaNavigation() throws Exception {
createInitialStructure();
@@ -245,7 +238,7 @@ public class AndroidLibraryProjectTest extends UsefulTestCase {
assertEquals("main.xml", ((PsiFile)targetElement).getName());
}
public void testLayoutFileMarkers() throws Exception {
/*public void testLayoutFileMarkers() throws Exception {
createInitialStructure();
myFixture.copyFileToProject(BASE_PATH + "RJavaFileMarkers.java", "app/src/p1/p2/R.java");
myFixture.copyFileToProject(BASE_PATH + "RJavaFileMarkers.java", "app/src/p1/p2/lib/R.java");
@@ -284,7 +277,7 @@ public class AndroidLibraryProjectTest extends UsefulTestCase {
assertNotNull(targets);
assertTrue(targets.length > 0);
assertEquals(field.getName(), 1, targets.length);
}
}*/
public void testFileResourceFindUsages() throws Throwable {
doFindUsagesTest("xml", "lib/res/layout/");