From b2bb137c32ac4d148f1dc366746538fd6f7b7a58 Mon Sep 17 00:00:00 2001 From: Andrey Starovoyt Date: Sun, 5 Mar 2017 17:52:26 +0300 Subject: [PATCH] html: fix incorrect condition --- .../analysis/HtmlFileReferenceHelper.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HtmlFileReferenceHelper.java b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HtmlFileReferenceHelper.java index 40c12a886140..b95403118b21 100644 --- a/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HtmlFileReferenceHelper.java +++ b/xml/xml-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HtmlFileReferenceHelper.java @@ -1,3 +1,18 @@ +/* + * Copyright 2000-2017 JetBrains s.r.o. + * + * 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 com.intellij.codeInsight.daemon.impl.analysis; import com.intellij.ide.highlighter.HtmlFileType; @@ -51,8 +66,9 @@ public class HtmlFileReferenceHelper extends FileReferenceHelper { @Override public boolean isMine(Project project, @NotNull VirtualFile file) { + if (!ProjectRootManager.getInstance(project).getFileIndex().isInContent(file)) return false; + final FileType fileType = file.getFileType(); - return ProjectRootManager.getInstance(project).getFileIndex().isInContent(file) && - fileType == HtmlFileType.INSTANCE || fileType == XHtmlFileType.INSTANCE; + return fileType == HtmlFileType.INSTANCE || fileType == XHtmlFileType.INSTANCE; } }