Merge pull request #828 from am11/css-selector-tooltip

Tooltip: Show full selector path. (#371)

Author: madskristensen

EditorExtensions/CSS/QuickInfo/Declaration/DeclarationQuickInfo.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
-using MadsKristensen.EditorExtensions.BrowserLink.UnusedCss;
 using MadsKristensen.EditorExtensions.Settings;
 using Microsoft.CSS.Core;
 using Microsoft.CSS.Editor;
@@ -60,7 +60,7 @@ public void AugmentQuickInfoSession(IQuickInfoSession session, IList<object> qiC
             //If the selector's full name would require computation (it's nested), compute it and add it to the output
             if (ruleSet != null && ruleSet.Parent.FindType<RuleSet>() != null)
             {
-                qiContent.Add(LessDocument.GetLessSelectorName(ruleSet));
+                qiContent.Add(GetSelectorText(session, point.Value, ruleSet));
             }
 
             applicableToSpan = _buffer.CurrentSnapshot.CreateTrackingSpan(tipItem.Start, tipItem.Length, SpanTrackingMode.EdgeNegative);
@@ -85,6 +85,37 @@ public void AugmentQuickInfoSession(IQuickInfoSession session, IList<object> qiC
             qiContent.Add(CreateBrowserList(browsers));
         }
 
+        private string GetSelectorText(IQuickInfoSession session, SnapshotPoint point, RuleSet rules)
+        {
+            if (rules == null || rules.Selectors.Count == 0)
+                return null;
+
+            var compilerResult = session.TextView.Properties.GetProperty("CssCompilerResult") as CssCompilerResult;
+
+            if (compilerResult == null)
+                return null;
+
+            StringBuilder result = new StringBuilder();
+
+            foreach (Selector item in rules.Selectors)
+            {
+                var line = point.GetContainingLine().LineNumber - 1;
+                var column = item.Start - point.Snapshot.GetLineFromPosition(item.Start).Start;
+
+                var node = compilerResult.SourceMap.MapNodes.FirstOrDefault(s =>
+                            s.SourceFilePath == _buffer.GetFileName() &&
+                            s.OriginalLine == line &&
+                            s.OriginalColumn == column);
+
+                if (node == null)
+                    return null;
+
+                result.Append(node.GeneratedSelector.Text).Append(" ");
+            }
+
+            return result.ToString();
+        }
+
         private static Tuple<ParseItem, ICssCompletionListEntry> GetEntriesAndPoint(ParseItem item, SnapshotPoint point, ICssSchemaInstance schema)
         {
             // Declaration

EditorExtensions/Shared/Helpers/CssSourceMap.cs

@@ -6,6 +6,7 @@
 using System.Web.Helpers;
 using Microsoft.CSS.Core;
 using Microsoft.CSS.Editor;
+using Microsoft.Scss.Core;
 using Microsoft.VisualStudio.Utilities;
 
 namespace MadsKristensen.EditorExtensions
@@ -102,9 +103,10 @@ private IEnumerable<CssSourceMapNode> CorrectionsForScss(string cssFileContents)
 
             ParseItem item = null;
             Selector selector = null;
+            SimpleSelector simple = null;
             StyleSheet styleSheet = null, cssStyleSheet = null;
             int start = 0, indexInCollection, targetDepth;
-            string fileContents = null;
+            string fileContents = null, simpleText = "";
             var result = new List<CssSourceMapNode>();
             var contentCollection = new Dictionary<string, string>(); // So we don't have to read file for each map item.
             var parser = new CssParser();
@@ -131,13 +133,16 @@ private IEnumerable<CssSourceMapNode> CorrectionsForScss(string cssFileContents)
 
                 item = cssStyleSheet.ItemAfterPosition(start);
                 selector = item.FindType<Selector>();
+                simple = item.FindType<SimpleSelector>();
 
-                if (selector == null)
+                if (selector == null || simple == null)
                     continue;
 
+                simpleText = simple.Text;
+
                 indexInCollection = sortedForGenerated.FindIndex(e => e.Equals(node));//sortedForGenerated.IndexOf(node);
 
-                targetDepth = 1;
+                targetDepth = 0;
 
                 for (int i = indexInCollection;
                      i >= 0 && node.GeneratedLine == sortedForGenerated[i].GeneratedLine;
@@ -153,10 +158,35 @@ private IEnumerable<CssSourceMapNode> CorrectionsForScss(string cssFileContents)
                     item = item.Parent;
                 }
 
-                selector = item.FindType<RuleSet>().Selectors.First();
+                // selector = item.FindType<RuleSet>().Selectors.First();
+
+                RuleSet rule;
+                ScssRuleBlock scssRuleBlock = item as ScssRuleBlock;
+
+                if (scssRuleBlock == null)
+                    rule = item as RuleSet;
+                else
+                    rule = scssRuleBlock.RuleSets.First();
+
+                // Because even on the same TreeDepth, there may be mulitple ruleblocks
+                // and the selector names may include & or other symbols which are diff
+                // fromt he generated counterpart, here is the guess work
+                item = rule.Children.FirstOrDefault(r => r is Selector && r.Text.Trim() == simpleText) as Selector;
+
+                selector = item == null ? null : item as Selector;
 
                 if (selector == null)
-                    continue;
+                {
+                    // One more try; dive deep and sniff then skip.
+                    var items = rule.Children.Where(r => r is RuleBlock)
+                                             .SelectMany(r => (r as RuleBlock).Children
+                                             .Where(s => s is RuleSet)
+                                             .Select(s => (s as RuleSet).Selectors.FirstOrDefault(sel => sel.Text.Trim() == simpleText)));
+                    selector = items.Any() ? items.First() : null;
+
+                    if (selector == null)
+                        continue;
+                }
 
                 node.OriginalLine = fileContents.Substring(0, selector.Start).Count(s => s == '\n');
                 node.OriginalColumn = fileContents.GetLineColumn(selector.Start, node.OriginalLine);