Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(managers): Use moo fallback for unknown fragments #9870

Merged
merged 3 commits into from
May 5, 2021
Merged

refactor(managers): Use moo fallback for unknown fragments #9870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dc6c68
refactor(managers): Use moo fallback for unknown fragments
May 5, 2021
c6bf8d1
Use fallback for strings too
May 5, 2021
894f460
Merge branch 'main' into refactor/use-moo-fallback-token
zharinov May 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/manager/bazel/extract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,23 +85,23 @@ const lexer = moo.states({
].join('|')
),
},
unknown: { match: /[^]/, lineBreaks: true },
unknown: moo.fallback,
},
longDoubleQuoted: {
stringFinish: { match: '"""', pop: 1 },
char: { match: /[^]/, lineBreaks: true },
char: moo.fallback,
},
doubleQuoted: {
stringFinish: { match: '"', pop: 1 },
char: { match: /[^]/, lineBreaks: true },
char: moo.fallback,
},
longSingleQuoted: {
stringFinish: { match: "'''", pop: 1 },
char: { match: /[^]/, lineBreaks: true },
char: moo.fallback,
},
singleQuoted: {
stringFinish: { match: "'", pop: 1 },
char: { match: /[^]/, lineBreaks: true },
char: moo.fallback,
},
});

Expand Down
2 changes: 1 addition & 1 deletion lib/manager/cake/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ const lexer = moo.states({
match: /^#(?:addin|tool|module)\s+"(?:nuget|dotnet):[^"]+"\s*$/,
value: (s: string) => s.trim().slice(1, -1),
},
unknown: { match: /[^]/, lineBreaks: true },
unknown: moo.fallback,
},
});

Expand Down
3 changes: 1 addition & 2 deletions lib/manager/gradle-lite/common.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,10 @@ export enum TokenType {
TripleDoubleQuotedStart = 'tripleDoubleQuotedStart',
TripleQuotedFinish = 'tripleQuotedFinish',

Char = 'char',
Chars = 'chars',
EscapedChar = 'escapedChar',
String = 'string',

UnknownLexeme = 'unknownChar',
UnknownFragment = 'unknownFragment',
}

Expand Down
23 changes: 10 additions & 13 deletions lib/manager/gradle-lite/tokenizer.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ describe(getName(), () => {
TokenType.RightBrace,
TokenType.RightBrace,
],
'@': [TokenType.UnknownLexeme],
'@': [TokenType.UnknownFragment],
"'\\''": [
TokenType.SingleQuotedStart,
TokenType.EscapedChar,
Expand All @@ -54,23 +54,22 @@ describe(getName(), () => {
],
"'x'": [
TokenType.SingleQuotedStart,
TokenType.Char,
TokenType.Chars,
TokenType.SingleQuotedFinish,
],
"'\n'": [
TokenType.SingleQuotedStart,
TokenType.Char,
TokenType.Chars,
TokenType.SingleQuotedFinish,
],
"'$x'": [
TokenType.SingleQuotedStart,
TokenType.Char,
TokenType.Char,
TokenType.Chars,
TokenType.SingleQuotedFinish,
],
"''''''": ['tripleQuotedStart', 'tripleQuotedFinish'],
"'''x'''": ['tripleQuotedStart', TokenType.Char, 'tripleQuotedFinish'],
"'''\n'''": ['tripleQuotedStart', TokenType.Char, 'tripleQuotedFinish'],
"'''x'''": ['tripleQuotedStart', TokenType.Chars, 'tripleQuotedFinish'],
"'''\n'''": ['tripleQuotedStart', TokenType.Chars, 'tripleQuotedFinish'],
"'''\\''''": [
'tripleQuotedStart',
TokenType.EscapedChar,
Expand Down Expand Up @@ -106,12 +105,12 @@ describe(getName(), () => {
],
'"x"': [
TokenType.DoubleQuotedStart,
TokenType.Char,
TokenType.Chars,
TokenType.DoubleQuotedFinish,
],
'"\n"': [
TokenType.DoubleQuotedStart,
TokenType.Char,
TokenType.Chars,
TokenType.DoubleQuotedFinish,
],
// eslint-disable-next-line no-template-curly-in-string
Expand All @@ -130,17 +129,15 @@ describe(getName(), () => {
'"${x()}"': [
TokenType.DoubleQuotedStart,
TokenType.IgnoredInterpolationStart,
TokenType.UnknownLexeme,
TokenType.UnknownLexeme,
TokenType.UnknownLexeme,
TokenType.UnknownFragment,
TokenType.RightBrace,
TokenType.DoubleQuotedFinish,
],
// eslint-disable-next-line no-template-curly-in-string
'"${x{}}"': [
TokenType.DoubleQuotedStart,
TokenType.IgnoredInterpolationStart,
TokenType.UnknownLexeme,
TokenType.UnknownFragment,
TokenType.LeftBrace,
TokenType.RightBrace,
TokenType.RightBrace,
Expand Down
38 changes: 10 additions & 28 deletions lib/manager/gradle-lite/tokenizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,26 +55,26 @@ const lexer = moo.states({
match: '"',
push: TokenType.DoubleQuotedStart,
},
[TokenType.UnknownLexeme]: { match: /./ },
[TokenType.UnknownFragment]: moo.fallback,
},

// Tokenize triple-quoted string literal characters
[TokenType.TripleSingleQuotedStart]: {
...escapedChars,
[TokenType.TripleQuotedFinish]: { match: "'''", pop: 1 },
[TokenType.Char]: { match: /[^]/, lineBreaks: true },
[TokenType.Chars]: moo.fallback,
},
[TokenType.TripleDoubleQuotedStart]: {
...escapedChars,
[TokenType.TripleQuotedFinish]: { match: '"""', pop: 1 },
[TokenType.Char]: { match: /[^]/, lineBreaks: true },
[TokenType.Chars]: moo.fallback,
},

// Tokenize single-quoted string literal characters
[TokenType.SingleQuotedStart]: {
...escapedChars,
[TokenType.SingleQuotedFinish]: { match: "'", pop: 1 },
[TokenType.Char]: { match: /[^]/, lineBreaks: true },
[TokenType.Chars]: moo.fallback,
},

// Tokenize double-quoted string literal chars and interpolations
Expand All @@ -91,7 +91,7 @@ const lexer = moo.states({
match: /\${/,
push: TokenType.IgnoredInterpolationStart,
},
[TokenType.Char]: { match: /[^]/, lineBreaks: true },
[TokenType.Chars]: moo.fallback,
},

// Ignore interpolation of complex expressions˙,
Expand All @@ -102,34 +102,17 @@ const lexer = moo.states({
push: TokenType.IgnoredInterpolationStart,
},
[TokenType.RightBrace]: { match: '}', pop: 1 },
[TokenType.UnknownLexeme]: { match: /[^]/, lineBreaks: true },
[TokenType.UnknownFragment]: moo.fallback,
},
});

/*
Turn UnknownLexeme chars to UnknownFragment strings
*/
function processUnknownLexeme(acc: Token[], token: Token): Token[] {
if (token.type === TokenType.UnknownLexeme) {
const prevToken: Token = acc[acc.length - 1];
if (prevToken?.type === TokenType.UnknownFragment) {
prevToken.value += token.value;
} else {
acc.push({ ...token, type: TokenType.UnknownFragment });
}
} else {
acc.push(token);
}
return acc;
}

//
// Turn separated chars of string literal to single String token
// Turn substrings of chars and escaped chars into single String token
//
function processChar(acc: Token[], token: Token): Token[] {
function processChars(acc: Token[], token: Token): Token[] {
const tokenType = token.type;
const prevToken: Token = acc[acc.length - 1];
if ([TokenType.Char, TokenType.EscapedChar].includes(tokenType)) {
if ([TokenType.Chars, TokenType.EscapedChar].includes(tokenType)) {
if (prevToken?.type === TokenType.String) {
prevToken.value += token.value;
} else {
Expand Down Expand Up @@ -221,8 +204,7 @@ export function extractRawTokens(input: string): Token[] {

export function processTokens(tokens: Token[]): Token[] {
return tokens
.reduce(processUnknownLexeme, [])
.reduce(processChar, [])
.reduce(processChars, [])
.reduce(processInterpolation, [])
.filter(filterTokens);
}
Expand Down