@NotNull getCanonicalText()

diff --git a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpBackrefImpl.java b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpBackrefImpl.java
index 63bad0e924d710e64fbe7d8d67751d24675f4f54..1e2b7b6b24420da859079db34982e71802f71aec 100644 (file)
--- a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpBackrefImpl.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpBackrefImpl.java
@@ -80,6 +80,7 @@ public class RegExpBackrefImpl extends RegExpElementImpl implements RegExpBackre
                 return TextRange.from(0, getElement().getTextLength());
             }
 
+            @NotNull
             public String getCanonicalText() {
                 return getElement().getText();
             }

diff --git a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java
index 8f58881c7f96cb69f2aa5e40b139ad238e2f7ef2..de169fa939a911ea1460c3c27c7848da74035ea0 100644 (file)
--- a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java
@@ -102,6 +102,7 @@ public class RegExpPropertyImpl extends RegExpElementImpl implements RegExpPrope
             return RegExpPropertyImpl.this;
         }
 
+        @NotNull
         public String getCanonicalText() {
             return getRangeInElement().substring(getElement().getText());
         }

diff --git a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPyNamedGroupRefImpl.java b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPyNamedGroupRefImpl.java
index 83944fa42102ca1cbffb173936aa0218103c8b97..a3f7e1dfd9f4cf1aed0817cf67e0e8439f510998 100644 (file)
--- a/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPyNamedGroupRefImpl.java
+++ b/RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPyNamedGroupRefImpl.java
@@ -87,6 +87,7 @@ public class RegExpPyNamedGroupRefImpl extends RegExpElementImpl implements RegE
         return RegExpPyNamedGroupRefImpl.this.resolve();
       }
 
+      @NotNull
       public String getCanonicalText() {
         return getRangeInElement().substring(getText());
       }

diff --git a/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java b/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java
index 863b93555417b1f4189b40895c4945b002d5d0d0..0ad9eb7b9722516340ac104d7f26629351bdcc6e 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java
+++ b/java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java
@@ -87,6 +87,7 @@ public abstract class AbstractQualifiedReference<T extends AbstractQualifiedRefe
   }
 
 
+  @NotNull
   public  String getCanonicalText() {
     return getText();
   }

diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
index 57adfbf230427ad9c6150440dec90c4b6060c28b..f99f24f8d252aafd2d6d6dd1c5c04c54f7af2c36 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsJavaCodeReferenceElementImpl.java
@@ -95,6 +95,7 @@ public class ClsJavaCodeReferenceElementImpl extends ClsElementImpl implements P
     return this;
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myCanonicalText;
   }

diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java
index 2983154903b66e2ddf6fb0c4fa9cd15c8754c997..4fc4696f75a800dd0edade7207750288f3926f26 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsReferenceExpressionImpl.java
@@ -121,6 +121,7 @@ public class ClsReferenceExpressionImpl extends ClsElementImpl implements PsiRef
     return new TextRange(0, getTextLength());
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myPatternExpression.getCanonicalText();
   }

diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java
index 2c9c154b800c2f0c7fb52a6f12e0dc2314dc55c4..4133b98a8123c16119bf3f4fee9627d2ad77c742 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsTypeParameterReferenceImpl.java
@@ -107,6 +107,7 @@ public class ClsTypeParameterReferenceImpl extends ClsElementImpl implements Psi
     return false;
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myName;
   }

diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightClassReference.java b/java/java-impl/src/com/intellij/psi/impl/light/LightClassReference.java
index 6e9331b4a524fdccb194154d3704881e51256405..c46f0aef4e87c0848727f6952a00b58f24a20f11 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/light/LightClassReference.java
+++ b/java/java-impl/src/com/intellij/psi/impl/light/LightClassReference.java
@@ -168,6 +168,7 @@ public class LightClassReference extends LightElement implements PsiJavaCodeRefe
     return this;
   }
 
+  @NotNull
   public String getCanonicalText() {
     String name = getQualifiedName();
     if (name == null) return null;

diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightMemberReference.java b/java/java-impl/src/com/intellij/psi/impl/light/LightMemberReference.java
index b02a2c66fb82d5b8e82383bd89921c928bf09fec..7032bd44cc4b8863f151255994205058a7c9ba1b 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/light/LightMemberReference.java
+++ b/java/java-impl/src/com/intellij/psi/impl/light/LightMemberReference.java
@@ -95,6 +95,7 @@ public class LightMemberReference extends LightElement implements PsiJavaCodeRef
     return this;
   }
 
+  @NotNull
   public String getCanonicalText() {
     String name = getQualifiedName();
     if (name == null) return null;

diff --git a/java/java-impl/src/com/intellij/psi/impl/light/LightPackageReference.java b/java/java-impl/src/com/intellij/psi/impl/light/LightPackageReference.java
index c6b7e8c8a42de1f7a03f8f9dc813491f2a710136..49a055c9c9fea3937512f70bca1667ed54ff7d72 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/light/LightPackageReference.java
+++ b/java/java-impl/src/com/intellij/psi/impl/light/LightPackageReference.java
@@ -73,6 +73,7 @@ public class LightPackageReference extends LightElement implements PsiJavaCodeRe
     return this;
   }
 
+  @NotNull
   public String getCanonicalText(){
     return getText();
   }

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java
index 75796c8dd24f9f3a596d2081e8eeefa4c5639283..437a678cbb1ea55a0dc319967ed8755999bcda55 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java
@@ -228,6 +228,7 @@ public class PsiEnumConstantImpl extends JavaStubPsiElement<PsiFieldStub> implem
       return advancedResolve(false).getElement();
     }
 
+    @NotNull
     public String getCanonicalText() {
       return getContainingClass().getName();
     }

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java
index 1528fd1b25dc74b344d97756c58396bfd811f037..541d80207ca1dfdefcc505191a46f05f379221be 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java
@@ -182,6 +182,7 @@ public class PsiImportStaticReferenceElementImpl extends CompositePsiElement imp
     return new TextRange(startOffset, startOffset + nameChild.getTextLength());
   }
 
+  @NotNull
   public String getCanonicalText() {
     String canonicalText = myCanonicalText;
     if (canonicalText == null) {

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
index cb280f2e422a67dfdefc067b292f0fcea4d00806..4c32e03f3e62495b3c43bb9a9cbcf6537cf2526c 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaCodeReferenceElementImpl.java
@@ -263,6 +263,7 @@ public class PsiJavaCodeReferenceElementImpl extends CompositePsiElement impleme
     }
   }
 
+  @NotNull
   public String getCanonicalText() {
     switch (getKind()) {
       case CLASS_NAME_KIND:

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiLabelReference.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiLabelReference.java
index fe1dac35655ce1225412e18a17fc2023bbf96b0c..9572fa180e51c485099e49d9ce25ba2d25722507 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/PsiLabelReference.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiLabelReference.java
@@ -65,6 +65,7 @@ public class PsiLabelReference implements PsiReference{
       return null;
     }
 
+    @NotNull
     public String getCanonicalText(){
       return getElement().getText();
     }

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java
index 4ba92eed93e4c2b9ac923dd7b7363a1ee077937c..b6902af7d931ff044890115352b85774bc8ad73d 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocMethodOrFieldRef.java
@@ -267,6 +267,7 @@ public class PsiDocMethodOrFieldRef extends CompositePsiElement implements PsiDo
       return false;
     }
 
+    @NotNull
     public String getCanonicalText() {
       return getNameElement().getText();
     }

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocParamRef.java b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocParamRef.java
index 315b41eab32f0c3a91654140abcbedae6f440166..d1ed0fbe0b06c639b6cd76ad5eae7005d0fee0ed 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocParamRef.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/javadoc/PsiDocParamRef.java
@@ -81,6 +81,7 @@ public class PsiDocParamRef extends CompositePsiElement implements PsiDocTagValu
         return resultReference;
       }
 
+      @NotNull
       public String getCanonicalText() {
         return valueToken.getText();
       }

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
index 49860ba3b2c9288834a750c03a06dfbbf0c58c3e..8e8890f27c511ed869f803c05991436ed81d8b79 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java
@@ -159,6 +159,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer
     return myRange;
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myText;
   }

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java
index 9b0cf8fd6df951cb7201edad8ed69ea0b7eda0b7..3597fea5840c31173fc6604de0accea57af280d4 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNameValuePairImpl.java
@@ -158,6 +158,7 @@ public class PsiNameValuePairImpl extends CompositePsiElement implements PsiName
         return MethodSignatureUtil.findMethodBySignature(refClass, signature, false);
       }
 
+      @NotNull
       public String getCanonicalText() {
         String name = getName();
         return name != null ? name : PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME;

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java
index 08b7ec622f15e5cdc79586e225ef70bd2be61831..798fac111c3d72b6932685ae5daa8af4905fc67a 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiNewExpressionImpl.java
@@ -148,6 +148,7 @@ public class PsiNewExpressionImpl extends ExpressionPsiElement implements PsiNew
         return null;
       }
 
+      @NotNull
       public String getCanonicalText() {
         return null;
       }

diff --git a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
index deea549bc0d10f2475c4e9b18d64d55b37d8cc15..16c1b2ca634cf937994361a5cdb9b0de9269286d 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiReferenceExpressionImpl.java
@@ -291,6 +291,7 @@ public class PsiReferenceExpressionImpl extends ExpressionPsiElement implements
     return (JavaResolveResult[])results;
   }
 
+  @NotNull
   public String getCanonicalText() {
     PsiElement element = resolve();
     if (element instanceof PsiClass) return ((PsiClass)element).getQualifiedName();

diff --git a/platform/lang-api/src/com/intellij/psi/PsiReference.java b/platform/lang-api/src/com/intellij/psi/PsiReference.java
index c7da48de7b540ef68afec28a8efdf36a1512cac9..9389f82118b3e6279ffb391da81c2f4530dd9c83 100644 (file)
--- a/platform/lang-api/src/com/intellij/psi/PsiReference.java
+++ b/platform/lang-api/src/com/intellij/psi/PsiReference.java
@@ -64,6 +64,7 @@ public interface PsiReference {
    *
    * @return the canonical text of the reference.
    */
+  @NotNull
   String getCanonicalText();
 
   /**

diff --git a/platform/lang-api/src/com/intellij/psi/PsiReferenceBase.java b/platform/lang-api/src/com/intellij/psi/PsiReferenceBase.java
index 99aeb7473dd531a83c17379367af1c446269a16c..4e527134996fb223779efeb8cf3077255706f30c 100644 (file)
--- a/platform/lang-api/src/com/intellij/psi/PsiReferenceBase.java
+++ b/platform/lang-api/src/com/intellij/psi/PsiReferenceBase.java
@@ -87,6 +87,7 @@ public abstract class PsiReferenceBase<T extends PsiElement> implements PsiRefer
     return manipulator.getRangeInElement(myElement);
   }
 
+  @NotNull
   public String getCanonicalText() {
     return getValue();
   }

diff --git a/platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java b/platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java
index 9d10113631346b8f930c4240dcf95b13d7c4c1df..46b156bc6888590752650a181d583fdae53ffdd6 100644 (file)
--- a/platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java
+++ b/platform/lang-impl/src/com/intellij/openapi/paths/PsiDynaReference.java
@@ -104,6 +104,7 @@ public class PsiDynaReference<T extends PsiElement> extends PsiReferenceBase<T>
     return resolveResults.length == 1 ? resolveResults[0].getElement() : null;
   }
 
+  @NotNull
   public String getCanonicalText(){
     final PsiReference reference = chooseReference();
     return reference == null ? myReferences.get(0).getCanonicalText() : reference.getCanonicalText();

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiMultiReference.java b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiMultiReference.java
index c1670b02592f76c96c347ff1beac376910116e7f..f8b5c7f8f6bcb36cf5364e68816d1865ec4a3edb 100644 (file)
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiMultiReference.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiMultiReference.java
@@ -108,6 +108,7 @@ public class PsiMultiReference implements PsiPolyVariantReference {
     return myReferences.length > 1 && COMPARATOR.compare(myReferences[0], myReferences[1]) == 0;
   }
 
+  @NotNull
   public String getCanonicalText(){
     return chooseReference().getCanonicalText();
   }

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java
index bad72948b7e0369cb2867742e5fe139a57452ac1..b3a4b296e486382784b576036287a762370edcd5 100644 (file)
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/FileReference.java
@@ -323,6 +323,7 @@ public class FileReference implements FileReferenceOwner, PsiPolyVariantReferenc
     return myRange;
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myText;
   }

diff --git a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/StringLiteralReference.java b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/StringLiteralReference.java
index 8bf9b38560f9e0d88777bc1f4848f66f1ddfe351..0fcd26db7ffe4ce2bb2346612a638d69373515ea 100644 (file)
--- a/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/StringLiteralReference.java
+++ b/plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/util/StringLiteralReference.java
@@ -42,6 +42,7 @@ public abstract class StringLiteralReference implements PsiReference {
     return ElementManipulators.getValueTextRange(myValue);
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myValue.getText();
   }

diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntEntityReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntEntityReference.java
index 2817c3ba88351f6c517202536a7ee29e5e6793fb..a33acc12c9f0bf21fb3291608ee01183be5542ac 100644 (file)
--- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntEntityReference.java
+++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntEntityReference.java
@@ -46,6 +46,7 @@ public class AntEntityReference implements PsiReference {
     return myXmlRef.resolve();
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myXmlRef.getCanonicalText();
   }

diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntGenericReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntGenericReference.java
index b34e823a8d0599d69f5c7899651d39e0110da964..a4f1b6668c7a04d315904b3ccf9546562f5e0dff 100644 (file)
--- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntGenericReference.java
+++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntGenericReference.java
@@ -59,6 +59,7 @@ public abstract class AntGenericReference extends CachingReference implements An
     return myTextRange;
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myText;
   }

diff --git a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntMacroDefParameterReference.java b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntMacroDefParameterReference.java
index d20fb6294d1270b63b2f6f0afa52efc6be7a6774..0f6bb162433c9ead3b54211a4a20a878e201007b 100644 (file)
--- a/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntMacroDefParameterReference.java
+++ b/plugins/ant/src/com/intellij/lang/ant/psi/impl/reference/AntMacroDefParameterReference.java
@@ -43,7 +43,7 @@ public class AntMacroDefParameterReference extends AntGenericReference {
     myXmlElement = xmlElement;
   }
 
-  @Nullable
+  @NotNull
   public String getCanonicalText() {
     String text = super.getCanonicalText();
     if (text.indexOf("${") >= 0) {

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantTargetReference.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantTargetReference.java
index 77c19a1d78490df2114c5b6cbdf33173de9d9fb8..fc2e7fe198ee74d9f115f30250d6c981a32ebc5f 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantTargetReference.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/gant/GantTargetReference.java
@@ -106,6 +106,7 @@ public class GantTargetReference implements PsiPolyVariantReference {
     return null;
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myRefExpr.getCanonicalText();
   }

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocMemberReferenceImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocMemberReferenceImpl.java
index 6f124e9bcfe30229152f2f587451417f105836dd..3016d4fd81e0981006cb4bcc8f67a181567683d3 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocMemberReferenceImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocMemberReferenceImpl.java
@@ -91,8 +91,9 @@ public abstract class GrDocMemberReferenceImpl extends GroovyDocPsiElementImpl i
     return new TextRange(offsetInParent, offsetInParent + refNameElement.getTextLength());
   }
 
+  @NotNull
   public String getCanonicalText() {
-    return null;
+    return getRangeInElement().substring(getElement().getText());
   }
 
   public boolean isSoft() {

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocParameterReferenceImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocParameterReferenceImpl.java
index 7d9fecffa82ab67eb6ea2966c4d28dbeecef3ddc..23f13745c009dfe2b74d13319a4e69db71a717c4 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocParameterReferenceImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/groovydoc/psi/impl/GrDocParameterReferenceImpl.java
@@ -108,6 +108,7 @@ public class GrDocParameterReferenceImpl extends GroovyDocPsiElementImpl impleme
     return results[0].getElement();
   }
 
+  @NotNull
   public String getCanonicalText() {
     return getName();
   }

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrLabelReference.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrLabelReference.java
index 8d526828c7fb394d070fc1f0465db96b8d363566..8bea5cd7cbff38605950c727aef546faff09563e 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrLabelReference.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/GrLabelReference.java
@@ -61,6 +61,7 @@ public class GrLabelReference implements PsiReference {
     return resolve() == element;
   }
 
+  @NotNull
   public String getCanonicalText() {
     final String name = myStatement.getLabelName();
     if (name == null) return "";

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationNameValuePairImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationNameValuePairImpl.java
index 39b33c697d3ca2d818a3d71ad396f73164875355..946dd01b3110a73c7b6223b2a1c2d0a9a95a2867 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationNameValuePairImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/auxiliary/annotation/GrAnnotationNameValuePairImpl.java
@@ -115,8 +115,9 @@ public class GrAnnotationNameValuePairImpl extends GroovyPsiElementImpl implemen
     return ppParent instanceof GrAnnotation ? (GrAnnotation)ppParent : null;
   }
 
+  @NotNull
   public String getCanonicalText() {
-    return null;
+    return getRangeInElement().substring(getText());
   }
 
   public PsiElement handleElementRename(String newElementName) throws IncorrectOperationException {

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrConstructorInvocationImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrConstructorInvocationImpl.java
index 70eb6243e0c912188761f3114757dd23bd857d23..7b15870ed22790526897802c52d51359e3ddb2a1 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrConstructorInvocationImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/GrConstructorInvocationImpl.java
@@ -149,6 +149,7 @@ public class GrConstructorInvocationImpl extends GroovyPsiElementImpl implements
     return resolveConstructor();
   }
 
+  @NotNull
   public String getCanonicalText() {
     return getText(); //TODO
   }

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentLabelImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentLabelImpl.java
index 3586c29fcc36267e6a37935d01b007ffb1be4c63..4678ffe182f7995ffbf69e9b15a8f1143cf4d8b4 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentLabelImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/arguments/GrArgumentLabelImpl.java
@@ -126,6 +126,7 @@ public class GrArgumentLabelImpl extends GroovyPsiElementImpl implements GrArgum
     return null;
   }
 
+  @NotNull
   public String getCanonicalText() {
     PsiElement resolved = resolve();
     if (resolved instanceof PsiMember && resolved instanceof PsiNamedElement) {

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
index b2554d9a3327310906a5bc011b7c1f1f5a4daa08..463015f3c68420f9096176be49ba681fd42eef65 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/expressions/GrReferenceExpressionImpl.java
@@ -643,9 +643,9 @@ public class GrReferenceExpressionImpl extends GrReferenceElementImpl implements
     return Kind.TYPE_OR_PROPERTY;
   }
 
-  @Nullable
+  @NotNull
   public String getCanonicalText() {
-    return null;
+    return getRangeInElement().substring(getElement().getText());
   }
 
   public boolean isReferenceTo(PsiElement element) {

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
index 7b10fe96db43e14c5b760cd1e25d7e8ff31fbf47..e0f58f8262d54041af488f3a3be19d5e8330a1d3 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/types/GrCodeReferenceElementImpl.java
@@ -156,7 +156,7 @@ public class GrCodeReferenceElementImpl extends GrReferenceElementImpl implement
     return CLASS;
   }
 
-  @Nullable
+  @NotNull
   public String getCanonicalText() {
     PsiElement resolved = resolve();
     if (resolved instanceof PsiClass) {

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPsiReference.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPsiReference.java
index 67e34ed128dd6699580a3590ae16c5bce15f6f13..d2db6b7f3e9599de15db7510cb5deb1a39d0d625 100644 (file)
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPsiReference.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPsiReference.java
@@ -52,6 +52,7 @@ public abstract class MavenPsiReference implements PsiReference {
     return myElement;
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myText;
   }

diff --git a/plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java b/plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java
index cddc130d24378bb328ffdddfdd933736c5cee36d..ef5ed7eeb1520cf8002a3599e9ce3f4534babc27 100644 (file)
--- a/plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java
+++ b/plugins/properties/src/com/intellij/lang/properties/ResourceBundleReference.java
@@ -54,6 +54,7 @@ public class ResourceBundleReference extends PsiReferenceBase<PsiElement> implem
     return result;
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myBundleName;
   }

diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ReferenceInForm.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ReferenceInForm.java
index 3e94d99bad1ceecac4cc7da8225b8e3881e2a93e..36baa07f26950a2271d8bd447acee972ed0a0dac 100644 (file)
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ReferenceInForm.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/ReferenceInForm.java
@@ -58,6 +58,7 @@ public abstract class ReferenceInForm implements PsiReference {
     return new TextRange(myRangeMarker.getStartOffset(), myRangeMarker.getEndOffset());
   }
 
+  @NotNull
   public String getCanonicalText() {
     return getRangeText();
   }

diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/ReferenceBase.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/ReferenceBase.java
index 877e17e1010db98a0624c6e8176b6ebbf483fc3f..a4294d828c57711f4116a2cdc240fc95a7a9281a 100644 (file)
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/ReferenceBase.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/ReferenceBase.java
@@ -49,6 +49,7 @@ public abstract class ReferenceBase implements PsiReference {
         return null;
     }
 
+    @NotNull
     public String getCanonicalText() {
         return nameNode.getText();
     }

diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathVariableReferenceImpl.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathVariableReferenceImpl.java
index 580f738e50477513ec11a615c381e22103406c89..e7c3c324825dcb281110848603aa81bb96ef7299 100644 (file)
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathVariableReferenceImpl.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/psi/impl/XPathVariableReferenceImpl.java
@@ -91,6 +91,7 @@ public class XPathVariableReferenceImpl extends XPathElementImpl implements XPat
         return context.resolve(this);
     }
 
+    @NotNull
     public String getCanonicalText() {
         return getText();
     }

diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ExternalResourceReference.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ExternalResourceReference.java
index 3548f3f843020b0ec09c54053567802971175b59..f9f3225894c80698bcf9a71321206c43831eb153 100644 (file)
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ExternalResourceReference.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/ExternalResourceReference.java
@@ -83,6 +83,7 @@ class ExternalResourceReference implements PsiReference, QuickFixProvider<Extern
         return null;
     }
 
+    @NotNull
     public String getCanonicalText() {
         return myAttribute.getValue();
     }

diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SelfReference.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SelfReference.java
index 5eaf0e6d5e115d24066cc1ab18c3712b154a6cff..aa9380f41bd8bbabf3e69ca8614f024a41979c17 100644 (file)
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SelfReference.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SelfReference.java
@@ -48,6 +48,7 @@ class SelfReference implements PsiReference {
         return myValue.isValid() ? myTarget : null;
     }
 
+    @NotNull
     public String getCanonicalText() {
         return myValue.getText();
     }

diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SimpleAttributeReference.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SimpleAttributeReference.java
index 31a75bcc43d4e5002b17c8f89c6aeef5bb51b198..d0004833c26f1f42ffe7023c91cdfbdf496ad15f 100644 (file)
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SimpleAttributeReference.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/impl/references/SimpleAttributeReference.java
@@ -33,6 +33,7 @@ abstract class SimpleAttributeReference implements PsiReference {
         myAttribute = attribute;
     }
 
+    @NotNull
     public String getCanonicalText() {
         return getTextRange().substring(myAttribute.getValue());
     }

diff --git a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java
index d01679d8073868bfa9b1823ab03deaaccfa9859e..7de4779952a4d31f3eb96642c640d7e338438663 100644 (file)
--- a/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java
+++ b/xml/dom-impl/src/com/intellij/util/xml/impl/GenericDomValueReference.java
@@ -136,6 +136,7 @@ public class GenericDomValueReference<T> extends PsiReferenceBase<XmlElement> im
     return value == null ? null : resolveInner(value);
   }
 
+  @NotNull
   public String getCanonicalText() {
     return getStringValue();
   }

diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReference.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReference.java
index d2b85de211eb4c424ff89a461425f03319fff8b8..83fe1a5bf5229ecd1fac550030beb83070625cc8 100644 (file)
--- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReference.java
+++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/encoding/XmlEncodingReference.java
@@ -71,6 +71,7 @@ public class XmlEncodingReference implements PsiReference, EmptyResolveMessagePr
     return XmlErrorMessages.message("unknown.encoding.0");
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myCharsetName;
   }

diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/BasicAttributeValueReference.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/BasicAttributeValueReference.java
index 91166e4bc258b68a0214e79646cfe49a1bff6ae0..b3c0fbc318000ad5dec460f7520ad1491be11c50 100644 (file)
--- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/BasicAttributeValueReference.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/BasicAttributeValueReference.java
@@ -50,6 +50,7 @@ public abstract class BasicAttributeValueReference implements PsiReference {
     return myRange;
   }
 
+  @NotNull
   public String getCanonicalText() {
     final String s = myElement.getText();
     if (myRange.getStartOffset() < s.length() && myRange.getEndOffset() <= s.length()) {

diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdReferencesProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdReferencesProvider.java
index 66a3b512b747bb354ac8721eb69f8d32b5a173ee..5905265bb30158d9f3ac8c72ddf11aca372de6ce 100644 (file)
--- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdReferencesProvider.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/DtdReferencesProvider.java
@@ -113,6 +113,7 @@ public class DtdReferencesProvider extends PsiReferenceProvider {
       return null;
     }
 
+    @NotNull
     public String getCanonicalText() {
       final XmlElement nameElement = myNameElement;
       return nameElement != null ? nameElement.getText() : "";
@@ -210,6 +211,7 @@ public class DtdReferencesProvider extends PsiReferenceProvider {
       return xmlEntityDecl;
     }
 
+    @NotNull
     public String getCanonicalText() {
       return myRange.substring(myElement.getText());
     }

diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java
index 068b66c16d6abe383fa9cc3e45c8aa0b9caa44a1..8e8d85aeab86dee24ff12ad985865b68c3b94c7e 100644 (file)
--- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/SchemaReferencesProvider.java
@@ -150,6 +150,7 @@ public class SchemaReferencesProvider extends PsiReferenceProvider {
       return myElement.getParent().getParent();
     }
 
+    @NotNull
     public String getCanonicalText() {
       String text = myElement.getText();
       return text.substring(1,text.length()- 1);
@@ -412,6 +413,7 @@ public class SchemaReferencesProvider extends PsiReferenceProvider {
       return namespaceByPrefix;
     }
 
+    @NotNull
     public String getCanonicalText() {
       final String text = myElement.getText();
       String name = myRange.getEndOffset() < text.length() ? myRange.substring(text) : "";

diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReference.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReference.java
index d387d5b0abe5085deed8acd0392da3b932b491fd..1ff705ff9454d764cc250870736a189ff1b92b06 100644 (file)
--- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReference.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/URLReference.java
@@ -145,6 +145,7 @@ public class URLReference implements PsiReference, QuickFixProvider, EmptyResolv
     return null;
   }
 
+  @NotNull
   public String getCanonicalText() {
     final String text = myElement.getText();
     if (text.length() > 1) {

diff --git a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java
index abc239fbd0c9beb96571509dfda5cafa26f3eaf2..9bccd2589707240eeddc515c490a6bbefd651da2 100644 (file)
--- a/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/XmlValueReference.java
@@ -22,6 +22,7 @@ import com.intellij.psi.ElementManipulator;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.util.IncorrectOperationException;
+import org.jetbrains.annotations.NotNull;
 
 /**
  * @author Dmitry Avdeev
@@ -43,6 +44,7 @@ public abstract class XmlValueReference implements PsiReference {
     return myRange;
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myRange.substring(myTag.getText());
   }

diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java b/xml/impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java
index 80270442197b9a96366b8220a4a14e4b28836351..09b7cd5af448127dfeccda25e8b3c8ea950050f0 100644 (file)
--- a/xml/impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/xml/TagNameReference.java
@@ -109,6 +109,7 @@ public class TagNameReference implements PsiReference {
     return null;
   }
 
+  @NotNull
   public String getCanonicalText() {
     return getNameElement().getText();
   }

diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java
index a3b28dd8d8873d4aa14c3750cb1d554a89bf1a8f..e41e2254961db18647a23045b2b24f3242e334d8 100644 (file)
--- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlAttributeImpl.java
@@ -394,6 +394,7 @@ public class XmlAttributeImpl extends XmlElementImpl implements XmlAttribute {
       return descriptor != null ? descriptor.getDeclaration() : null;
     }
 
+    @NotNull
     public String getCanonicalText() {
       return getName();
     }

diff --git a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java
index 93640437e49bc2df76e2fe6973aa5727f5baee1a..9e8512c7573bddef4fa1d8bb70ff66c1872e92ba 100644 (file)
--- a/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java
+++ b/xml/impl/src/com/intellij/psi/impl/source/xml/XmlDoctypeImpl.java
@@ -200,6 +200,7 @@ public class XmlDoctypeImpl extends XmlElementImpl implements XmlDoctype, XmlEle
           return (docTypePublic != null)?
                  super.getVariants(): EMPTY_ARRAY;
         }
+        @NotNull
         public String getCanonicalText() {
           return extractValue(dtdUrlElement);
         }

diff --git a/xml/impl/src/com/intellij/xml/util/AnchorReference.java b/xml/impl/src/com/intellij/xml/util/AnchorReference.java
index e829e1df2ff5a7f93252b5ae9565603126215ca7..3b6ea0f67fa78bd9be7ba386766c01b95f40c03c 100644 (file)
--- a/xml/impl/src/com/intellij/xml/util/AnchorReference.java
+++ b/xml/impl/src/com/intellij/xml/util/AnchorReference.java
@@ -175,6 +175,7 @@ class AnchorReference implements PsiReference, EmptyResolveMessageProvider {
     return null;
   }
 
+  @NotNull
   public String getCanonicalText() {
     return myAnchor;
   }