hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-27 17:55:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

JavaScript: Autoformat all QL files.

Browse Source
This commit is contained in:
Max Schaefer
2019-01-07 10:15:45 +00:00
parent aa6b89dc34
commit 31bb39a810
380 changed files with 9957 additions and 13923 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
javascript/ql/src/Statements/DanglingElse.ql
View File

@@ -17,11 +17,7 @@ import javascript
* A token that is relevant for this query, that is, an `if`, `else` or `}` token.
*/
class RelevantToken extends Token {
RelevantToken() {
exists (string v | v = getValue() |
v = "if" or v = "else" or v = "}"
)
}
RelevantToken() { exists(string v | v = getValue() | v = "if" or v = "else" or v = "}") }
}
/**
@@ -54,9 +50,10 @@ int semanticIndent(RelevantToken tk) {
not prevTokenOnSameLine(tk, _, _, _) and
result = tk.getLocation().getStartColumn()
or
exists (RelevantToken prev |
exists(RelevantToken prev |
prevTokenOnSameLine(tk, "if", prev, "else") or
prevTokenOnSameLine(tk, "else", prev, "}") |
prevTokenOnSameLine(tk, "else", prev, "}")
|
result = semanticIndent(prev)
)
}
@@ -64,24 +61,23 @@ int semanticIndent(RelevantToken tk) {
/**
* Gets the semantic indentation of the `if` token of statement `i`.
*/
int ifIndent(IfStmt i) {
result = semanticIndent(i.getIfToken())
}
int ifIndent(IfStmt i) { result = semanticIndent(i.getIfToken()) }
/**
* Gets the semantic indentation of the `else` token of statement `i`,
* if any.
*/
int elseIndent(IfStmt i) {
result = semanticIndent(i.getElseToken())
}
int elseIndent(IfStmt i) { result = semanticIndent(i.getElseToken()) }
from IfStmt outer, IfStmt inner, Token outerIf, Token innerIf, Token innerElse, int outerIndent
where inner = outer.getThen().getAChildStmt*() and
outerIf = outer.getIfToken() and outerIndent = ifIndent(outer) and
innerIf = inner.getIfToken() and innerElse = inner.getElseToken() and
outerIndent < ifIndent(inner) and
outerIndent = elseIndent(inner) and
not outer.getTopLevel().isMinified()
where
inner = outer.getThen().getAChildStmt*() and
outerIf = outer.getIfToken() and
outerIndent = ifIndent(outer) and
innerIf = inner.getIfToken() and
innerElse = inner.getElseToken() and
outerIndent < ifIndent(inner) and
outerIndent = elseIndent(inner) and
not outer.getTopLevel().isMinified()
select innerElse, "This else branch belongs to $@, but its indentation suggests it belongs to $@.",
innerIf, "this if statement", outerIf, "this other if statement"
innerIf, "this if statement", outerIf, "this other if statement"