IDEA-47253: "Cannot resolve servlet" warning is show only for html in web resource...

diff --git a/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceManagerImpl.java
index 984f9ad10ee4ca5fc7ab5d22e9c35ecc397765ed..765d3fad8220bec7c681ae4a081031a2d632e6ae 100644 (file)
--- a/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/paths/PathReferenceManagerImpl.java
@@ -252,7 +252,7 @@ public class PathReferenceManagerImpl extends PathReferenceManager {
     for (Iterator<PsiReference> it = set.iterator(); it.hasNext();) {
       PsiReference reference = it.next();
       final TextRange range = reference.getRangeInElement();
-      if (endOffset == -1 || range.getStartOffset() < endOffset) {
+      if (endOffset == -1 || range.getStartOffset() <= endOffset) {
         startOffset = Math.min(startOffset, range.getStartOffset());
         endOffset = Math.max(range.getEndOffset(), endOffset);
         toAdd.add(reference);

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 d2ba8d1ad574603bdc44327772b28e532804d400..50e6dbdd2d473cd0e33ee635985fd4c3d71bf12a 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
@@ -192,6 +192,7 @@ public class FileReference implements FileReferenceOwner, PsiPolyVariantReferenc
     return _text;
   }
 
+  @NotNull
   public Object[] getVariants() {
     final String s = getText();
     if (s != null && s.equals("/")) {