From 39afbd217c3fddbf785fa035fce75eec4c0b2fad Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Mon, 22 Dec 2014 15:44:32 +0100
Subject: [PATCH] expand and clarify SSR variable tool tips

---
 .../structuralsearch/plugin/ui/UIUtil.java    | 27 +++++++++++++++----
 .../source/messages/SSRBundle.properties      | 12 ++++++---
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java
index 7521b9bbc014..7e0ae86516c1 100644
--- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java
+++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/UIUtil.java
@@ -146,17 +146,34 @@ public class UIUtil {
         append(buf, SSRBundle.message("target.tooltip.message"));
       }
       if (constraint.getRegExp() != null && constraint.getRegExp().length() > 0) {
-        append(buf, SSRBundle.message("text.tooltip.message", constraint.isInvertRegExp() ? SSRBundle.message("not.tooltip.message") : "",
-                                     constraint.getRegExp(),
-                                     constraint.isWithinHierarchy() || constraint.isStrictlyWithinHierarchy() ?
-                                     SSRBundle.message("within.hierarchy.tooltip.message") : ""));
+        append(buf, SSRBundle.message("text.tooltip.message",
+                                      constraint.isInvertRegExp() ? SSRBundle.message("not.tooltip.message") : "", constraint.getRegExp()));
+      }
+      if (constraint.isWithinHierarchy() || constraint.isStrictlyWithinHierarchy()) {
+        append(buf, SSRBundle.message("within.hierarchy.tooltip.message"));
+      }
+
+      if (constraint.isReadAccess()) {
+        append(buf, SSRBundle.message("value.read.tooltip.message",
+                                      constraint.isInvertReadAccess() ? SSRBundle.message("not.tooltip.message") : ""));
+      }
+      if (constraint.isWriteAccess()) {
+        append(buf, SSRBundle.message("value.written.tooltip.message",
+                                      constraint.isInvertWriteAccess() ? SSRBundle.message("not.tooltip.message") : ""));
       }
 
       if (constraint.getNameOfExprType() != null && constraint.getNameOfExprType().length() > 0) {
         append(buf, SSRBundle.message("exprtype.tooltip.message",
                                      constraint.isInvertExprType() ? SSRBundle.message("not.tooltip.message") : "",
                                      constraint.getNameOfExprType(),
-                                     constraint.isExprTypeWithinHierarchy() ? SSRBundle.message("within.hierarchy.tooltip.message") : ""));
+                                     constraint.isExprTypeWithinHierarchy() ? SSRBundle.message("supertype.tooltip.message") : ""));
+      }
+
+      if (constraint.getNameOfFormalArgType() != null && constraint.getNameOfFormalArgType().length() > 0) {
+        append(buf, SSRBundle.message("expected.type.tooltip.message",
+                                      constraint.isInvertFormalType() ? SSRBundle.message("not.tooltip.message") : "",
+                                      constraint.getNameOfFormalArgType(),
+                                      constraint.isFormalArgTypeWithinHierarchy() ? SSRBundle.message("supertype.tooltip.message") : ""));
       }
 
       if (constraint.getMinCount() == constraint.getMaxCount()) {
diff --git a/platform/structuralsearch/source/messages/SSRBundle.properties b/platform/structuralsearch/source/messages/SSRBundle.properties
index 5087bf2716d0..03e22b45699a 100644
--- a/platform/structuralsearch/source/messages/SSRBundle.properties
+++ b/platform/structuralsearch/source/messages/SSRBundle.properties
@@ -169,10 +169,14 @@ script.option.text=Script text\:
 occurs.tooltip.message=occurs: {0}
 min.occurs.tooltip.message=min occurs: {0}, max occurs: {1}
 target.tooltip.message=target
-text.tooltip.message={0} like: {1}{2}
-exprtype.tooltip.message={0} like: {1}{2}
-not.tooltip.message=not
-within.hierarchy.tooltip.message=\ within hierarchy
+text.tooltip.message=text{0} like: {1}
+exprtype.tooltip.message=type{2}{0} like: {1}
+supertype.tooltip.message=\ or supertype
+expected.type.tooltip.message=expected type{2}{0} like: {1}
+value.read.tooltip.message=value is{0} read
+value.written.tooltip.message=value is{0} written
+not.tooltip.message=\ not
+within.hierarchy.tooltip.message=search in supers
 script.tooltip.message=script: {0}
 replacement.variable.is.not.defined.message=Replacement variable {0} is not defined.
 replacement.variable.is.not.valid=Replacement variable {0} has script code problem {1}