Merge pull request github#11731 from github/hmakholm/pr/no-option

hmakholm · web-flow · commit ca1c46331a4d · 2022-12-19T15:36:51.000+01:00
remove com.semmle.util.data.Option from from extractor code interface II
diff --git a/javascript/extractor/src/com/semmle/js/extractor/HTMLExtractor.java b/javascript/extractor/src/com/semmle/js/extractor/HTMLExtractor.java
@@ -13,7 +13,6 @@
 import com.semmle.js.extractor.ExtractorConfig.Platform;
 import com.semmle.js.extractor.ExtractorConfig.SourceType;
 import com.semmle.js.parser.ParseError;
-import com.semmle.util.data.Option;
 import com.semmle.util.data.Pair;
 import com.semmle.util.data.StringUtil;
 import com.semmle.util.io.WholeIO;
@@ -239,7 +238,7 @@ public Pair<List<Label>, LoCInfo> extractEx(TextualExtractor textualExtractor) {
       extractor.setSourceMap(textualExtractor.getSourceMap());
     }
 
-    List<Label> rootNodes = extractor.doit(Option.some(eltHandler));
+    List<Label> rootNodes = extractor.doit(eltHandler);
 
     return Pair.make(rootNodes, locInfo);
   }

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@`
`13`	`13`	`import com.semmle.js.extractor.ExtractorConfig.Platform;`
`14`	`14`	`import com.semmle.js.extractor.ExtractorConfig.SourceType;`
`15`	`15`	`import com.semmle.js.parser.ParseError;`
`16`		`-import com.semmle.util.data.Option;`
`17`	`16`	`import com.semmle.util.data.Pair;`
`18`	`17`	`import com.semmle.util.data.StringUtil;`
`19`	`18`	`import com.semmle.util.io.WholeIO;`
`@@ -239,7 +238,7 @@ public Pair<List<Label>, LoCInfo> extractEx(TextualExtractor textualExtractor) {`
`239`	`238`	`extractor.setSourceMap(textualExtractor.getSourceMap());`
`240`	`239`	`}`
`241`	`240`
`242`		`- List<Label> rootNodes = extractor.doit(Option.some(eltHandler));`
	`241`	`+ List<Label> rootNodes = extractor.doit(eltHandler);`
`243`	`242`
`244`	`243`	`return Pair.make(rootNodes, locInfo);`
`245`	`244`	`}`