Update PrintCfg queries to use new interface

Author: asgerf

java/ql/lib/printCfg.ql

@@ -8,6 +8,7 @@
  */
 
 import java
+import PrintCfg
 
 external string selectedSourceFile();
 
@@ -21,14 +22,14 @@ external int selectedSourceColumn();
 
 private predicate selectedSourceColumnAlias = selectedSourceColumn/0;
 
-module ViewCfgQueryInput implements ViewCfgQueryInputSig<File> {
+module ViewCfgQueryInput implements ViewGraphQueryInputSig<File> {
   predicate selectedSourceFile = selectedSourceFileAlias/0;
 
   predicate selectedSourceLine = selectedSourceLineAlias/0;
 
   predicate selectedSourceColumn = selectedSourceColumnAlias/0;
 
-  predicate cfgScopeSpan(
+  predicate callableSpan(
     Callable callable, File file, int startLine, int startColumn, int endLine, int endColumn
   ) {
     file = callable.getFile() and
@@ -42,4 +43,4 @@ module ViewCfgQueryInput implements ViewCfgQueryInputSig<File> {
   }
 }
 
-import ViewCfgQuery<File, ViewCfgQueryInput>
+import ViewGraphQuery<File, ViewCfgQueryInput>

java/ql/lib/semmle/code/java/ControlFlowGraph.qll

@@ -1776,16 +1776,28 @@ class ConditionNode extends ControlFlow::Node {
   ExprParent getCondition() { result = this.asExpr() or result = this.asStmt() }
 }
 
-private import codeql.controlflow.PrintGraph as PrintGraph
+private import codeql.util.PrintGraph as PrintGraph
 
 private module PrintGraphInput implements PrintGraph::InputSig<Location> {
   private import java as J
 
   class Callable = J::Callable;
 
-  class ControlFlowNode = J::ControlFlowNode;
+  final private class FinalControlFlowNode = J::ControlFlowNode;
 
-  ControlFlowNode getASuccessor(ControlFlowNode n, SuccessorType t) { result = n.getASuccessor(t) }
+  class Node extends FinalControlFlowNode {
+    string getOrderDisambiguation() { result = "" }
+  }
+
+  predicate edge(Node node1, string s, Node node2) {
+    exists(SuccessorType t |
+      node2 = node1.getASuccessor(t) and
+      if t instanceof DirectSuccessor then s = "" else s = t.toString()
+    )
+  }
 }
 
-import PrintGraph::PrintGraph<Location, PrintGraphInput>
+/** Provides utilities for visualising the CFG. */
+module PrintCfg {
+  import PrintGraph::PrintGraph<Location, PrintGraphInput>
+}

ruby/ql/lib/ide-contextual-queries/printCfg.ql

@@ -10,6 +10,7 @@
 private import codeql.Locations
 private import codeql.ruby.controlflow.internal.ControlFlowGraphImpl
 private import codeql.ruby.controlflow.ControlFlowGraph
+private import PrintCfg
 
 external string selectedSourceFile();
 
@@ -23,19 +24,19 @@ external int selectedSourceColumn();
 
 private predicate selectedSourceColumnAlias = selectedSourceColumn/0;
 
-module ViewCfgQueryInput implements ViewCfgQueryInputSig<File> {
+module ViewCfgQueryInput implements ViewGraphQueryInputSig<File> {
   predicate selectedSourceFile = selectedSourceFileAlias/0;
 
   predicate selectedSourceLine = selectedSourceLineAlias/0;
 
   predicate selectedSourceColumn = selectedSourceColumnAlias/0;
 
-  predicate cfgScopeSpan(
+  predicate callableSpan(
     CfgScope scope, File file, int startLine, int startColumn, int endLine, int endColumn
   ) {
     file = scope.getFile() and
     scope.getLocation().hasLocationInfo(_, startLine, startColumn, endLine, endColumn)
   }
 }
 
-import ViewCfgQuery<File, ViewCfgQueryInput>
+import ViewGraphQuery<File, ViewCfgQueryInput>

rust/ql/lib/ide-contextual-queries/PrintCfg.ql

@@ -10,6 +10,7 @@
 private import codeql.files.FileSystem
 private import codeql.rust.controlflow.internal.ControlFlowGraphImpl
 private import codeql.rust.controlflow.ControlFlowGraph
+private import PrintCfg
 
 /**
  * Gets the source file to generate a CFG from.
@@ -32,19 +33,19 @@ external int selectedSourceColumn();
 
 private predicate selectedSourceColumnAlias = selectedSourceColumn/0;
 
-private module ViewCfgQueryInput implements ViewCfgQueryInputSig<File> {
+private module ViewCfgQueryInput implements ViewGraphQueryInputSig<File> {
   predicate selectedSourceFile = selectedSourceFileAlias/0;
 
   predicate selectedSourceLine = selectedSourceLineAlias/0;
 
   predicate selectedSourceColumn = selectedSourceColumnAlias/0;
 
-  predicate cfgScopeSpan(
+  predicate callableSpan(
     CfgScope scope, File file, int startLine, int startColumn, int endLine, int endColumn
   ) {
     file = scope.getFile() and
     scope.getLocation().hasLocationInfo(_, startLine, startColumn, endLine, endColumn)
   }
 }
 
-import ViewCfgQuery<File, ViewCfgQueryInput>
+import ViewGraphQuery<File, ViewCfgQueryInput>

shared/controlflow/codeql/controlflow/Cfg.qll

@@ -1330,7 +1330,10 @@ module MakeWithSplitting<
     }
   }
 
-  import Pp::PrintGraph<Location, PrintGraphInput>
+  /** Provides utilities for visualising the CFG. */
+  module PrintCfg {
+    import Pp::PrintGraph<Location, PrintGraphInput>
+  }
 
   /** Provides a set of consistency queries. */
   module Consistency {

swift/ql/lib/codeql/swift/controlflow/internal/PrintCFG.ql

@@ -33,19 +33,19 @@ external int selectedSourceColumn();
 
 private predicate selectedSourceColumnAlias = selectedSourceColumn/0;
 
-module ViewCfgQueryInput implements Impl::ViewCfgQueryInputSig<File> {
+module ViewCfgQueryInput implements Impl::PrintCfg::ViewGraphQueryInputSig<File> {
   predicate selectedSourceFile = selectedSourceFileAlias/0;
 
   predicate selectedSourceLine = selectedSourceLineAlias/0;
 
   predicate selectedSourceColumn = selectedSourceColumnAlias/0;
 
-  predicate cfgScopeSpan(
+  predicate callableSpan(
     CfgInput::CfgScope scope, File file, int startLine, int startColumn, int endLine, int endColumn
   ) {
     file = scope.getFile() and
     scope.getLocation().hasLocationInfo(_, startLine, startColumn, endLine, endColumn)
   }
 }
 
-import Impl::ViewCfgQuery<File, ViewCfgQueryInput>
+import Impl::PrintCfg::ViewGraphQuery<File, ViewCfgQueryInput>