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

Jump to bottom

fix(manager/sbt): support more seq constructors #12541

Merged
merged 9 commits into from
Dec 10, 2021
Merged

fix(manager/sbt): support more seq constructors #12541

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
dfef179
add some more seq constructors for sbt
martijnhoekstra Nov 7, 2021
eb03e02
lint-fix to meet line length requirements
martijnhoekstra Nov 7, 2021
f9cfcba
Merge branch 'main' into sbt-list
rarkins Nov 8, 2021
9bb066f
parenthesize seq alternatives
martijnhoekstra Nov 8, 2021
02be7ee
Merge branch 'sbt-list' of github.com:martijnhoekstra/renovate into s…
martijnhoekstra Nov 8, 2021
c1417a5
Merge branch 'main' into sbt-list
rarkins Nov 9, 2021
8203b5c
Merge branch 'main' into sbt-list
rarkins Dec 8, 2021
b0b3938
Merge branch 'main' into sbt-list
rarkins Dec 10, 2021
fc64b8e
Merge branch 'main' into sbt-list
rarkins Dec 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/manager/sbt/__fixtures__/dependency-file.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ object Dependencies {
"com.abc" % "abc-b" % abcVersion
)

val aloneDepInSeq = Seq("com.abc" % "abc-c" % abcVersion)
val aloneDepInSeq = List("com.abc" % "abc-c" % abcVersion)
}
17 changes: 11 additions & 6 deletions lib/manager/sbt/extract.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,16 @@ const getScalaVersionVariable = (str: string): string =>

const isResolver = (str: string): boolean =>
regEx(
/^\s*(resolvers\s*\+\+?=\s*(Seq\()?)?"[^"]*"\s*at\s*"[^"]*"[\s,)]*$/
/^\s*(resolvers\s*\+\+?=\s*((Seq|List|Stream)\()?)?"[^"]*"\s*at\s*"[^"]*"[\s,)]*$/
).test(str);
const getResolverUrl = (str: string): string =>
str
.replace(regEx(/^\s*(resolvers\s*\+\+?=\s*(Seq\()?)?"[^"]*"\s*at\s*"/), '')
.replace(
regEx(
/^\s*(resolvers\s*\+\+?=\s*((Seq|List|Stream)\()?)?"[^"]*"\s*at\s*"/
),
''
)
.replace(regEx(/"[\s,)]*$/), '');

const isVarDependency = (str: string): boolean =>
Expand All @@ -94,12 +99,12 @@ const isVarDef = (str: string): boolean =>

const isVarSeqSingleLine = (str: string): boolean =>
regEx(
/^\s*(private\s*)?(lazy\s*)?val\s+[_a-zA-Z][_a-zA-Z0-9]*\s*=\s*Seq\(.*\).*\s*$/
/^\s*(private\s*)?(lazy\s*)?val\s+[_a-zA-Z][_a-zA-Z0-9]*\s*=\s*(Seq|List|Stream)\(.*\).*\s*$/
).test(str);

const isVarSeqMultipleLine = (str: string): boolean =>
regEx(
/^\s*(private\s*)?(lazy\s*)?val\s+[_a-zA-Z][_a-zA-Z0-9]*\s*=\s*Seq\(.*[^)]*.*$/
/^\s*(private\s*)?(lazy\s*)?val\s+[_a-zA-Z][_a-zA-Z0-9]*\s*=\s*(Seq|List|Stream)\(.*[^)]*.*$/
).test(str);

const getVarName = (str: string): string =>
Expand Down Expand Up @@ -250,14 +255,14 @@ function parseSbtLine(
} else if (isVarSeqSingleLine(line)) {
isMultiDeps = false;
const depExpr = line
.replace(regEx(/^.*Seq\(\s*/), '')
.replace(regEx(/^.*(Seq|List|Stream)\(\s*/), '')
.replace(regEx(/\).*$/), '');
dep = parseDepExpr(depExpr, {
...ctx,
});
} else if (isVarSeqMultipleLine(line)) {
isMultiDeps = true;
const depExpr = line.replace(regEx(/^.*Seq\(\s*/), '');
const depExpr = line.replace(regEx(/^.*(Seq|List|Stream)\(\s*/), '');
dep = parseDepExpr(depExpr, {
...ctx,
});
Expand Down