hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 18:25:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflicts during rebase

Browse Source
This commit is contained in:
Arthur Baars
2021-08-11 16:17:09 +02:00
committed by Dave Bartolomeo
parent 0afcb9cc86
commit ac2c315839
115 changed files with 232 additions and 232 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ql/test/TestUtilities/InlineExpectationsTestPrivate.qll
View File

@@ -1,5 +1,5 @@
import ruby
import codeql_ruby.ast.internal.TreeSitter
import codeql.ruby.ast.internal.TreeSitter
/**
* A class representing line comments in Ruby.

2
ql/test/library-tests/ast/Ast.ql
View File

@@ -2,4 +2,4 @@
* @kind graph
*/
import codeql_ruby.printAst
import codeql.ruby.printAst

6
ql/test/library-tests/ast/AstDesugar.ql
View File

@@ -2,9 +2,9 @@
* @kind graph
*/
import codeql_ruby.AST
import codeql_ruby.printAst
import codeql_ruby.ast.internal.Synthesis
import codeql.ruby.AST
import codeql.ruby.printAst
import codeql.ruby.ast.internal.Synthesis
class DesugarPrintAstConfiguration extends PrintAstConfiguration {
override predicate shouldPrintNode(AstNode n) {

2
ql/test/library-tests/ast/constants/constants.ql
View File

@@ -1,5 +1,5 @@
import ruby
import codeql_ruby.ast.internal.Module as M
import codeql.ruby.ast.internal.Module as M
query predicate constantAccess(ConstantAccess a, string kind, string name, string cls) {
(

2
ql/test/library-tests/controlflow/graph/Cfg.ql
View File

@@ -2,7 +2,7 @@
* @kind graph
*/
import codeql_ruby.controlflow.internal.Cfg
import codeql.ruby.controlflow.internal.Cfg
class MyRelevantCfgNode extends RelevantCfgNode {
MyRelevantCfgNode() { exists(this) }

4
ql/test/library-tests/dataflow/api-graphs/use.ql
View File

@@ -1,7 +1,7 @@
import ruby
import codeql_ruby.DataFlow
import codeql.ruby.DataFlow
import TestUtilities.InlineExpectationsTest
import codeql_ruby.ApiGraphs
import codeql.ruby.ApiGraphs
class ApiUseTest extends InlineExpectationsTest {
ApiUseTest() { this = "ApiUseTest" }

2
ql/test/library-tests/dataflow/call-sensitivity/call-sensitivity.ql
View File

@@ -3,7 +3,7 @@
*/
import ruby
import codeql_ruby.DataFlow
import codeql.ruby.DataFlow
import DataFlow::PathGraph
class Conf extends DataFlow::Configuration {

2
ql/test/library-tests/dataflow/local/DataflowStep.ql
View File

@@ -1,5 +1,5 @@
import ruby
import codeql_ruby.DataFlow
import codeql.ruby.DataFlow
from DataFlow::Node pred, DataFlow::Node succ
where DataFlow::localFlowStep(pred, succ)

2
ql/test/library-tests/dataflow/local/ReturnNodes.ql
View File

@@ -1,4 +1,4 @@
import ruby
import codeql_ruby.dataflow.internal.DataFlowPrivate
import codeql.ruby.dataflow.internal.DataFlowPrivate
select any(ReturnNode node)

4
ql/test/library-tests/frameworks/ActionController.ql
View File

@@ -1,6 +1,6 @@
private import ruby
private import codeql_ruby.frameworks.ActionController
private import codeql_ruby.frameworks.ActionView
private import codeql.ruby.frameworks.ActionController
private import codeql.ruby.frameworks.ActionView
query predicate actionControllerControllerClasses(ActionControllerControllerClass cls) { any() }

4
ql/test/library-tests/frameworks/ActionView.ql
View File

@@ -1,5 +1,5 @@
import codeql_ruby.frameworks.ActionController
import codeql_ruby.frameworks.ActionView
import codeql.ruby.frameworks.ActionController
import codeql.ruby.frameworks.ActionView
query predicate htmlSafeCalls(HtmlSafeCall c) { any() }

4
ql/test/library-tests/frameworks/ActiveRecord.ql
View File

@@ -1,5 +1,5 @@
import codeql_ruby.controlflow.CfgNodes
import codeql_ruby.frameworks.ActiveRecord
import codeql.ruby.controlflow.CfgNodes
import codeql.ruby.frameworks.ActiveRecord
query predicate activeRecordModelClasses(ActiveRecordModelClass cls) { any() }

2
ql/test/library-tests/modules/methods.ql
View File

@@ -1,5 +1,5 @@
import ruby
import codeql_ruby.ast.internal.Module as M
import codeql.ruby.ast.internal.Module as M
query MethodBase getMethod(Module m, string name) {
result = M::ExposedForTestingOnly::getMethod(m, name)

2
ql/test/library-tests/regexp/parse.ql
View File

@@ -3,7 +3,7 @@
*/
import codeql.Locations
import codeql_ruby.regexp.RegExpTreeView as RETV
import codeql.ruby.regexp.RegExpTreeView as RETV
query predicate nodes(RETV::RegExpTerm n, string attr, string val) {
attr = "semmle.label" and

4
ql/test/library-tests/variables/parameter.ql
View File

@@ -1,5 +1,5 @@
import codeql_ruby.ast.Variable
import codeql_ruby.ast.Parameter
import codeql.ruby.ast.Variable
import codeql.ruby.ast.Parameter
query predicate parameterVariable(Parameter p, Variable v) { v = p.getAVariable() }

8
ql/test/library-tests/variables/ssa.ql
View File

@@ -1,7 +1,7 @@
import codeql_ruby.AST
import codeql_ruby.CFG
import codeql_ruby.ast.Variable
import codeql_ruby.dataflow.SSA
import codeql.ruby.AST
import codeql.ruby.CFG
import codeql.ruby.ast.Variable
import codeql.ruby.dataflow.SSA
query predicate definition(Ssa::Definition def, Variable v) { def.getSourceVariable() = v }

4
ql/test/library-tests/variables/varaccess.ql
View File

@@ -1,5 +1,5 @@
import codeql_ruby.AST
import codeql_ruby.ast.Variable
import codeql.ruby.AST
import codeql.ruby.ast.Variable
query predicate variableAccess(VariableAccess access, Variable variable, Scope scope) {
variable = access.getVariable() and

2
ql/test/library-tests/variables/variable.ql
View File

@@ -1,3 +1,3 @@
import codeql_ruby.ast.Variable
import codeql.ruby.ast.Variable
query predicate variable(Variable v) { any() }

2
ql/test/library-tests/variables/varscopes.ql
View File

@@ -1,3 +1,3 @@
import codeql_ruby.ast.Scope
import codeql.ruby.ast.Scope
select any(Scope x)