github
diff --git a/‎cpp/common/src/codingstandards/cpp/Locations.qll
Copy file name to clipboardExpand all lines: cpp/common/src/codingstandards/cpp/Locations.qll
+6Lines changed: 6 additions & 0 deletions b/‎cpp/common/src/codingstandards/cpp/Locations.qll
Copy file name to clipboardExpand all lines: cpp/common/src/codingstandards/cpp/Locations.qll
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎cpp/common/src/codingstandards/cpp/deviations/CodeIdentifierDeviation.qll
Copy file name to clipboardExpand all lines: cpp/common/src/codingstandards/cpp/deviations/CodeIdentifierDeviation.qll
+2-7Lines changed: 2 additions & 7 deletions b/‎cpp/common/src/codingstandards/cpp/deviations/CodeIdentifierDeviation.qll
Copy file name to clipboardExpand all lines: cpp/common/src/codingstandards/cpp/deviations/CodeIdentifierDeviation.qll
+2-7Lines changed: 2 additions & 7 deletions
@@ -22,3 +22,9 @@ int getLastColumnNumber(File f) {
       l.getEndColumn()
     )
 }
+
+/** Gets the last column number on the given line of `filepath`. */
+bindingset[filepath, lineNumber]
+int getLastColumnNumber(string filepath, int lineNumber) {
+  result = max(Location l | l.hasLocationInfo(filepath, _, _, lineNumber, _) | l.getEndColumn())
+}
@@ -32,6 +32,7 @@
 
 import cpp
 import Deviations
+import codingstandards.cpp.Locations
 
 string supportedStandard() { result = ["misra", "autosar", "cert"] }
 
@@ -358,13 +359,7 @@ class CodeIdentifierDeviation extends TCodeIndentifierDeviation {
       then endcolumn = commentMarker.(DeviationEndOfLineMarker).getLocation().getEndColumn()
       else
         // Find the last column for a location on the next line
-        endcolumn =
-          max(Location l |
-            l.hasLocationInfo(filepath, _, _, _, _) and
-            l.getEndLine() = suppressedLine
-          |
-            l.getEndColumn()
-          )
+        endcolumn = getLastColumnNumber(filepath, suppressedLine)
     )
     or
     this = TMultiLineDeviation(_, _, _, filepath, suppressedLine, endline) and
Original file line number	Diff line number	Diff line change
`@@ -22,3 +22,9 @@ int getLastColumnNumber(File f) {`
`22`	`22`	`l.getEndColumn()`
`23`	`23`	`)`
`24`	`24`	`}`
	`25`	`+`
	`26`	+/** Gets the last column number on the given line of `filepath`. */
	`27`	`+bindingset[filepath, lineNumber]`
	`28`	`+int getLastColumnNumber(string filepath, int lineNumber) {`
	`29`	`+ result = max(Location l \| l.hasLocationInfo(filepath, _, _, lineNumber, _) \| l.getEndColumn())`
	`30`	`+}`