hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-21 11:16:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

JS: Use separate ScopeManager for template exprs

Browse Source
This commit is contained in:
Asger Feldthaus
2021-07-28 10:55:29 +02:00
parent b36e9e0e54
commit e3e24f9880
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
javascript/extractor/src/com/semmle/js/extractor/HTMLExtractor.java
View File

@@ -9,6 +9,7 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import com.semmle.extractor.html.HtmlPopulator;
import com.semmle.js.extractor.ExtractorConfig.ECMAVersion;
import com.semmle.js.extractor.ExtractorConfig.Platform;
import com.semmle.js.extractor.ExtractorConfig.SourceType;
import com.semmle.js.parser.ParseError;
@@ -96,7 +97,6 @@ public class HTMLExtractor implements IExtractor {
extractTemplateTags(
textualExtractor,
scopeManager,
attr.getSource(),
attr.getBegin(),
attr.getEnd(),
@@ -154,7 +154,7 @@ public class HTMLExtractor implements IExtractor {
public void handleText(
Source src, int textBegin, int textEnd, Label parentLabel, boolean isCData) {
extractTemplateTags(
textualExtractor, scopeManager, src, textBegin, textEnd, () -> parentLabel);
textualExtractor, src, textBegin, textEnd, () -> parentLabel);
}
@Override
@@ -384,7 +384,6 @@ public class HTMLExtractor implements IExtractor {
private void extractTemplateTags(
TextualExtractor textualExtractor,
ScopeManager scopeManager,
Source root,
int start,
int end,
@@ -421,7 +420,7 @@ public class HTMLExtractor implements IExtractor {
extractSnippet(
TopLevelKind.ANGULAR_STYLE_TEMPLATE,
config.withSourceType(SourceType.ANGULAR_STYLE_TEMPLATE),
scopeManager,
new ScopeManager(textualExtractor.getTrapwriter(), ECMAVersion.ECMA2020, true),
textualExtractor,
m.group(bodyGroup),
m.start(bodyGroup),