From 00e71323afaa5c2ea79b89d8cf60f26a3c1d56e6 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Vilain <jean-baptiste.vilain@sonarsource.com>
Date: Wed, 17 Apr 2013 12:48:58 +0200
Subject: [PATCH] SONAR-3893 Added symbols class for debug purpose

---
 sonar-colorizer/src/main/resources/sonar-colorizer.css |  3 +++
 .../org/sonar/core/source/DecorationDataHolder.java    |  2 +-
 .../sonar/core/source/DecorationDataHolderTest.java    |  6 +++---
 .../org/sonar/core/source/HtmlSourceDecoratorTest.java | 10 +++++-----
 .../webapp/WEB-INF/app/views/resource/index.html.erb   |  1 +
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/sonar-colorizer/src/main/resources/sonar-colorizer.css b/sonar-colorizer/src/main/resources/sonar-colorizer.css
index 89719de6a0f..01b6c4b46c9 100644
--- a/sonar-colorizer/src/main/resources/sonar-colorizer.css
+++ b/sonar-colorizer/src/main/resources/sonar-colorizer.css
@@ -64,4 +64,7 @@
   font-weight: normal;
 }
 
+.highlighted {
+  background-color: #ff0000;
+}
 
diff --git a/sonar-core/src/main/java/org/sonar/core/source/DecorationDataHolder.java b/sonar-core/src/main/java/org/sonar/core/source/DecorationDataHolder.java
index 08c17ea1c32..d151cbf266a 100644
--- a/sonar-core/src/main/java/org/sonar/core/source/DecorationDataHolder.java
+++ b/sonar-core/src/main/java/org/sonar/core/source/DecorationDataHolder.java
@@ -74,7 +74,7 @@ public class DecorationDataHolder {
     for (int i = 0; i < symbolOccurrences.length; i++) {
       int occurrenceStartOffset = Integer.parseInt(symbolOccurrences[i]);
       int occurrenceEndOffset = occurrenceStartOffset + symbolLength;
-      lowerBoundsDefinitions.put(occurrenceStartOffset, SYMBOL_PREFIX + declarationStartOffset);
+      lowerBoundsDefinitions.put(occurrenceStartOffset, SYMBOL_PREFIX + declarationStartOffset + " highlightable");
       upperBoundsDefinitions.add(occurrenceEndOffset);
     }
   }
diff --git a/sonar-core/src/test/java/org/sonar/core/source/DecorationDataHolderTest.java b/sonar-core/src/test/java/org/sonar/core/source/DecorationDataHolderTest.java
index a2e1eebd2d0..db5cfb9e499 100644
--- a/sonar-core/src/test/java/org/sonar/core/source/DecorationDataHolderTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/source/DecorationDataHolderTest.java
@@ -51,11 +51,11 @@ public class DecorationDataHolderTest {
     assertThat(lowerBoundsDefinitions.containsEntry(0, "cppd"));
     assertThat(lowerBoundsDefinitions.containsEntry(54, "a"));
     assertThat(lowerBoundsDefinitions.containsEntry(69, "k"));
-    assertThat(lowerBoundsDefinitions.containsEntry(80, "symbol-ππ80"));
-    assertThat(lowerBoundsDefinitions.containsEntry(90, "symbol-90"));
+    assertThat(lowerBoundsDefinitions.containsEntry(80, "symbol-80 highlightable"));
+    assertThat(lowerBoundsDefinitions.containsEntry(90, "symbol-90 highlightable"));
     assertThat(lowerBoundsDefinitions.containsEntry(106, "cppd"));
     assertThat(lowerBoundsDefinitions.containsEntry(114, "k"));
-    assertThat(lowerBoundsDefinitions.containsEntry(140, "symbol-140"));
+    assertThat(lowerBoundsDefinitions.containsEntry(140, "symbol-140 highlightable"));
   }
 
   @Test
diff --git a/sonar-core/src/test/java/org/sonar/core/source/HtmlSourceDecoratorTest.java b/sonar-core/src/test/java/org/sonar/core/source/HtmlSourceDecoratorTest.java
index 18963495b27..091809b01e9 100644
--- a/sonar-core/src/test/java/org/sonar/core/source/HtmlSourceDecoratorTest.java
+++ b/sonar-core/src/test/java/org/sonar/core/source/HtmlSourceDecoratorTest.java
@@ -64,7 +64,7 @@ public class HtmlSourceDecoratorTest extends AbstractDaoTestCase {
       " * Header",
       " */",
       "",
-      "public class <span class=\"symbol-31\">HelloWorld</span> {",
+      "public class <span class=\"symbol-31 highlightable\">HelloWorld</span> {",
       "}"
     );
   }
@@ -81,11 +81,11 @@ public class HtmlSourceDecoratorTest extends AbstractDaoTestCase {
       "<span class=\"cppd\"> * Header</span>",
       "<span class=\"cppd\"> */</span>",
       "",
-      "<span class=\"k\">public </span><span class=\"k\">class </span><span class=\"symbol-31\">HelloWorld</span> {",
-      "  <span class=\"k\">public</span> <span class=\"k\">void</span> <span class=\"symbol-58\">foo</span>() {",
+      "<span class=\"k\">public </span><span class=\"k\">class </span><span class=\"symbol-31 highlightable\">HelloWorld</span> {",
+      "  <span class=\"k\">public</span> <span class=\"k\">void</span> <span class=\"symbol-58 highlightable\">foo</span>() {",
       "  }",
-      "  <span class=\"k\">public</span> <span class=\"k\">void</span> <span class=\"symbol-84\">bar</span>() {",
-      "    <span class=\"symbol-58\">foo</span>();",
+      "  <span class=\"k\">public</span> <span class=\"k\">void</span> <span class=\"symbol-84 highlightable\">bar</span>() {",
+      "    <span class=\"symbol-58 highlightable\">foo</span>();",
       "  }",
       "}"
     );
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/index.html.erb
index f1ba5bc0a8c..752923d18c4 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/resource/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/resource/index.html.erb
@@ -6,4 +6,5 @@
 <script type="text/javascript">
   // Always display title in popup mode
   openAccordionItem('<%= url_for(params.merge({:display_title => 'true', :popup => 'true'})) -%>', this);
+  $j("#accordion-panel").on("click", "span[class|='symbol']", highlight_usages);
 </script>
\ No newline at end of file
-- 
2.39.5