Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
renovate
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
GitHub Mirror
Renovate Bot
renovate
Commits
ad452346
Unverified
Commit
ad452346
authored
2 years ago
by
Johannes Feichtner
Committed by
GitHub
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
refactor(manager/gradle): reduce code redundancy when parsing maps (#20636)
parent
e7d82a49
No related branches found
Branches containing commit
Tags
38.85.0
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/modules/manager/gradle/parser/assignments.ts
+45
-67
45 additions, 67 deletions
lib/modules/manager/gradle/parser/assignments.ts
with
45 additions
and
67 deletions
lib/modules/manager/gradle/parser/assignments.ts
+
45
−
67
View file @
ad452346
import
{
query
as
q
}
from
'
good-enough-parser
'
;
import
{
parser
,
query
as
q
}
from
'
good-enough-parser
'
;
import
{
regEx
}
from
'
../../../../util/regex
'
;
import
{
regEx
}
from
'
../../../../util/regex
'
;
import
type
{
Ctx
}
from
'
../types
'
;
import
type
{
Ctx
}
from
'
../types
'
;
import
{
import
{
...
@@ -81,6 +81,27 @@ const qGroovySingleMapOfVarAssignment = q
...
@@ -81,6 +81,27 @@ const qGroovySingleMapOfVarAssignment = q
return
ctx
;
return
ctx
;
});
});
const
qGroovyMapOfExpr
=
(
search
:
q
.
QueryBuilder
<
Ctx
,
parser
.
Node
>
):
q
.
QueryBuilder
<
Ctx
,
parser
.
Node
>
=>
q
.
alt
(
q
.
sym
(
storeVarToken
)
.
op
(
'
:
'
)
.
tree
({
type
:
'
wrapped-tree
'
,
maxDepth
:
1
,
startsWith
:
'
[
'
,
endsWith
:
'
]
'
,
search
,
postHandler
:
(
ctx
:
Ctx
)
=>
{
ctx
.
varTokens
.
pop
();
return
ctx
;
},
}),
qGroovySingleMapOfVarAssignment
);
// versions = [ android: [ buildTools: '30.0.3' ], kotlin: '1.4.30' ]
// versions = [ android: [ buildTools: '30.0.3' ], kotlin: '1.4.30' ]
const
qGroovyMultiVarAssignment
=
qVariableAssignmentIdentifier
const
qGroovyMultiVarAssignment
=
qVariableAssignmentIdentifier
.
alt
(
q
.
op
(
'
=
'
),
q
.
op
(
'
+=
'
))
.
alt
(
q
.
op
(
'
=
'
),
q
.
op
(
'
+=
'
))
...
@@ -89,39 +110,7 @@ const qGroovyMultiVarAssignment = qVariableAssignmentIdentifier
...
@@ -89,39 +110,7 @@ const qGroovyMultiVarAssignment = qVariableAssignmentIdentifier
maxDepth
:
1
,
maxDepth
:
1
,
startsWith
:
'
[
'
,
startsWith
:
'
[
'
,
endsWith
:
'
]
'
,
endsWith
:
'
]
'
,
search
:
q
.
alt
(
search
:
qGroovyMapOfExpr
(
qGroovyMapOfExpr
(
qGroovySingleMapOfVarAssignment
)),
q
.
sym
(
storeVarToken
)
.
op
(
'
:
'
)
.
tree
({
type
:
'
wrapped-tree
'
,
maxDepth
:
1
,
startsWith
:
'
[
'
,
endsWith
:
'
]
'
,
search
:
q
.
alt
(
q
.
sym
(
storeVarToken
)
.
op
(
'
:
'
)
.
tree
({
type
:
'
wrapped-tree
'
,
maxDepth
:
1
,
startsWith
:
'
[
'
,
endsWith
:
'
]
'
,
search
:
qGroovySingleMapOfVarAssignment
,
postHandler
:
(
ctx
)
=>
{
ctx
.
varTokens
.
pop
();
return
ctx
;
},
}),
qGroovySingleMapOfVarAssignment
),
postHandler
:
(
ctx
)
=>
{
ctx
.
varTokens
.
pop
();
return
ctx
;
},
}),
qGroovySingleMapOfVarAssignment
),
})
})
.
handler
(
cleanupTempVars
);
.
handler
(
cleanupTempVars
);
...
@@ -143,6 +132,27 @@ const qKotlinSingleMapOfVarAssignment = qStringValue
...
@@ -143,6 +132,27 @@ const qKotlinSingleMapOfVarAssignment = qStringValue
return
ctx
;
return
ctx
;
});
});
const
qKotlinMapOfExpr
=
(
search
:
q
.
QueryBuilder
<
Ctx
,
parser
.
Node
>
):
q
.
QueryBuilder
<
Ctx
,
parser
.
Node
>
=>
q
.
alt
(
qStringValue
.
sym
(
'
to
'
)
.
sym
(
'
mapOf
'
)
.
tree
({
type
:
'
wrapped-tree
'
,
maxDepth
:
1
,
startsWith
:
'
(
'
,
endsWith
:
'
)
'
,
search
,
postHandler
:
(
ctx
:
Ctx
)
=>
{
ctx
.
varTokens
.
pop
();
return
ctx
;
},
}),
qKotlinSingleMapOfVarAssignment
);
// val versions = mapOf("foo1" to "bar1", "foo2" to "bar2", "foo3" to "bar3")
// val versions = mapOf("foo1" to "bar1", "foo2" to "bar2", "foo3" to "bar3")
const
qKotlinMultiMapOfVarAssignment
=
qVariableAssignmentIdentifier
const
qKotlinMultiMapOfVarAssignment
=
qVariableAssignmentIdentifier
.
op
(
'
=
'
)
.
op
(
'
=
'
)
...
@@ -152,39 +162,7 @@ const qKotlinMultiMapOfVarAssignment = qVariableAssignmentIdentifier
...
@@ -152,39 +162,7 @@ const qKotlinMultiMapOfVarAssignment = qVariableAssignmentIdentifier
maxDepth
:
1
,
maxDepth
:
1
,
startsWith
:
'
(
'
,
startsWith
:
'
(
'
,
endsWith
:
'
)
'
,
endsWith
:
'
)
'
,
search
:
q
.
alt
(
search
:
qKotlinMapOfExpr
(
qKotlinMapOfExpr
(
qKotlinSingleMapOfVarAssignment
)),
qStringValue
.
sym
(
'
to
'
)
.
sym
(
'
mapOf
'
)
.
tree
({
type
:
'
wrapped-tree
'
,
maxDepth
:
1
,
startsWith
:
'
(
'
,
endsWith
:
'
)
'
,
search
:
q
.
alt
(
qStringValue
.
sym
(
'
to
'
)
.
sym
(
'
mapOf
'
)
.
tree
({
type
:
'
wrapped-tree
'
,
maxDepth
:
1
,
startsWith
:
'
(
'
,
endsWith
:
'
)
'
,
search
:
qKotlinSingleMapOfVarAssignment
,
postHandler
:
(
ctx
:
Ctx
)
=>
{
ctx
.
varTokens
.
pop
();
return
ctx
;
},
}),
qKotlinSingleMapOfVarAssignment
),
postHandler
:
(
ctx
:
Ctx
)
=>
{
ctx
.
varTokens
.
pop
();
return
ctx
;
},
}),
qKotlinSingleMapOfVarAssignment
),
})
})
.
handler
(
cleanupTempVars
);
.
handler
(
cleanupTempVars
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment