Skip to content

Commit

Permalink
Fix a few *safe* ESLint no-var failures in src/core/evaluator.js
Browse files Browse the repository at this point in the history
…(13371 follow-up)

As can be seen in PR 13371, some of the `no-var` changes in the `PartialEvaluator.{getOperatorList, getTextContent}` methods caused errors in `gulp server`-mode.
However, there's a handful of instances of `var` in other methods which should be completely *safe* to convert since there's no strange scope-issues present in that code.
  • Loading branch information
Snuffleupagus committed May 16, 2021
1 parent a5c74f5 commit 718f7bf
Showing 1 changed file with 10 additions and 9 deletions.
19 changes: 10 additions & 9 deletions src/core/evaluator.js
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,8 @@ class PartialEvaluator {
} else {
bbox = null;
}
let optionalContent = null;
let optionalContent = null,
groupOptions;
if (dict.has("OC")) {
optionalContent = await this.parseMarkedContentProps(
dict.get("OC"),
Expand All @@ -404,7 +405,7 @@ class PartialEvaluator {
}
const group = dict.get("Group");
if (group) {
var groupOptions = {
groupOptions = {
matrix,
bbox,
smask,
Expand Down Expand Up @@ -3766,7 +3767,7 @@ class PartialEvaluator {
throw new FormatError("invalid font name");
}

let fontFile;
let fontFile, subtype, length1, length2, length3;
try {
fontFile = descriptor.get("FontFile", "FontFile2", "FontFile3");
} catch (ex) {
Expand All @@ -3778,13 +3779,13 @@ class PartialEvaluator {
}
if (fontFile) {
if (fontFile.dict) {
var subtype = fontFile.dict.get("Subtype");
if (subtype) {
subtype = subtype.name;
const subtypeEntry = fontFile.dict.get("Subtype");
if (subtypeEntry instanceof Name) {
subtype = subtypeEntry.name;
}
var length1 = fontFile.dict.get("Length1");
var length2 = fontFile.dict.get("Length2");
var length3 = fontFile.dict.get("Length3");
length1 = fontFile.dict.get("Length1");
length2 = fontFile.dict.get("Length2");
length3 = fontFile.dict.get("Length3");
}
}

Expand Down

0 comments on commit 718f7bf

Please sign in to comment.