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

IDEA-97264 IntelliLang support for "Path to File" language: @Reference dropped

Browse Source
This commit is contained in:
Dmitry Avdeev
2013-08-14 12:49:21 +04:00
parent dde009264a
commit 6efc72f3d1
3 changed files with 2 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-api/src/com/intellij/codeInsight/AnnotationUtil.java
-1
View File
@@ -62,7 +62,6 @@ public class AnnotationUtil {
@NonNls public static final String TEST_ONLY_SIMPLE_NAME = "TestOnly";
public static final String LANGUAGE = "org.intellij.lang.annotations.Language";
public static final String REFERENCE = "org.intellij.lang.annotations.Reference";
public static final Set<String> ALL_ANNOTATIONS;
platform/annotations/src/org/intellij/lang/annotations/Reference.java
-32
View File
@@ -1,32 +0,0 @@
/*
* Copyright 2006 Sascha Weinreuter
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.intellij.lang.annotations;
import org.jetbrains.annotations.NonNls;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
import static java.lang.annotation.ElementType.*;
@Retention(RetentionPolicy.CLASS)
@Target({ METHOD, FIELD, PARAMETER, LOCAL_VARIABLE, ANNOTATION_TYPE })
public @interface Reference {
@NonNls String value();
}
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java
+2 -3
View File
@@ -246,11 +246,10 @@ public class JavaLanguageInjectionSupport extends AbstractLanguageInjectionSuppo
if (factory == null) {
factory = JavaPsiFacade.getElementFactory(modifierListOwner.getProject());
}
String anno = Language.findLanguageByID(languageId) != null ? AnnotationUtil.LANGUAGE : AnnotationUtil.REFERENCE;
final PsiAnnotation annotation = factory.createAnnotationFromText("@" + anno + "(\"" + languageId + "\")", modifierListOwner);
final PsiAnnotation annotation = factory.createAnnotationFromText("@" + AnnotationUtil.LANGUAGE + "(\"" + languageId + "\")", modifierListOwner);
final PsiModifierList list = modifierListOwner.getModifierList();
assert list != null;
final PsiAnnotation existingAnnotation = list.findAnnotation(anno);
final PsiAnnotation existingAnnotation = list.findAnnotation(AnnotationUtil.LANGUAGE);
if (existingAnnotation != null) {
existingAnnotation.replace(annotation);
}