From 322524484ee805c2a9a623f0a3708a7a2bce5b2b Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Fri, 20 Jul 2018 12:12:18 +0300
Subject: [PATCH] IDEA-195754 Wrong hint in diff window for function params

---
 .../src/com/intellij/codeInsight/hints/ParameterHintsPass.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hints/ParameterHintsPass.java b/platform/lang-impl/src/com/intellij/codeInsight/hints/ParameterHintsPass.java
index 6fc2032a92b1..a2af1f6a0042 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hints/ParameterHintsPass.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hints/ParameterHintsPass.java
@@ -17,6 +17,7 @@ package com.intellij.codeInsight.hints;
 
 import com.intellij.codeHighlighting.EditorBoundHighlightingPass;
 import com.intellij.codeInsight.daemon.impl.ParameterHintsPresentationManager;
+import com.intellij.diff.util.DiffUtil;
 import com.intellij.lang.Language;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.Inlay;
@@ -71,7 +72,7 @@ public class ParameterHintsPass extends EditorBoundHighlightingPass {
 
     Language language = myFile.getLanguage();
     InlayParameterHintsProvider provider = InlayParameterHintsExtension.INSTANCE.forLanguage(language);
-    if (provider == null || !provider.canShowHintsWhenDisabled() && !isEnabled()) return;
+    if (provider == null || !provider.canShowHintsWhenDisabled() && !isEnabled() || DiffUtil.isDiffEditor(myEditor)) return;
 
     myTraverser.forEach(element -> process(element, provider));
   }