Include the original rule category.

Author: rvermeulen

cpp/common/src/codingstandards/cpp/guideline_recategorizations/ListGuidelineRecategorizations.ql

@@ -9,4 +9,4 @@ import cpp
 import GuidelineRecategorizations
 
 from GuidelineRecategorization gr
-select gr.getRuleId(), gr.getCategory()
+select gr.getRuleId(), gr.getQuery().getCategory(), gr.getCategory()

cpp/common/test/guideline_recategorizations/ListGuidelineRecategorizations.expected

@@ -1,9 +1,8 @@
-| A0-1-1 | advisory |
-| A0-1-1 | mandatory |
-| A0-1-2 | disapplied |
-| A0-1-6 | disapplied |
-| A1-4-3 | mandatory |
-| A10-4-1 | required |
-| A11-0-1 | mandatory |
-| CON50-CPP | required |
-| RULE-13-6 | required |
+| A0-1-1 | required | advisory |
+| A0-1-1 | required | mandatory |
+| A0-1-2 | required | disapplied |
+| A0-1-6 | advisory | disapplied |
+| A10-4-1 | advisory | required |
+| A11-0-1 | advisory | mandatory |
+| CON50-CPP | rule | required |
+| RULE-13-6 | mandatory | required |