Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
M
Mirai
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
MyCard
Mirai
Commits
ed5a5285
Commit
ed5a5285
authored
Apr 05, 2020
by
Him188
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Reduce duplication
parent
e454502e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
33 additions
and
34 deletions
+33
-34
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt
...nMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt
+33
-34
No files found.
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/message/data/MessageChain.kt
View file @
ed5a5285
...
...
@@ -439,36 +439,25 @@ object NullMessageChain : MessageChain {
// region implementations
@Suppress
(
"DuplicatedCode"
)
// we don't have pattern matching
@OptIn
(
MiraiExperimentalAPI
::
class
)
internal
fun
Sequence
<
SingleMessage
>.
constrainSingleMessages
():
List
<
SingleMessage
>
{
val
list
=
ArrayList
<
SingleMessage
>(
4
)
val
singleList
=
ArrayList
<
Message
.
Key
<
*
>
?
>(
4
)
for
(
singleMessage
in
this
)
{
if
(
singleMessage
is
ConstrainSingle
<
*
>)
{
val
key
=
singleMessage
.
key
val
index
=
singleList
.
indexOf
(
key
)
if
(
index
!=
-
1
)
{
list
[
index
]
=
singleMessage
continue
}
else
{
singleList
.
add
(
list
.
size
,
key
)
}
}
list
.
add
(
singleMessage
)
val
iterator
=
this
.
iterator
()
return
constrainSingleMessagesImpl
supplier
@
{
if
(
iterator
.
hasNext
())
{
iterator
.
next
()
}
else
null
}
return
list
}
@Suppress
(
"DuplicatedCode"
)
// we don't have pattern matching
@OptIn
(
MiraiExperimentalAPI
::
class
)
internal
fun
Iterable
<
SingleMessage
>.
constrainSingleMessages
():
List
<
SingleMessage
>
{
@MiraiExperimentalAPI
internal
inline
fun
constrainSingleMessagesImpl
(
iterator
:
()
->
SingleMessage
?):
ArrayList
<
SingleMessage
>
{
val
list
=
ArrayList
<
SingleMessage
>()
var
firstConstrainIndex
=
-
1
for
(
singleMessage
in
this
)
{
var
next
:
SingleMessage
?
do
{
next
=
iterator
()
next
?.
let
{
singleMessage
->
if
(
singleMessage
is
ConstrainSingle
<
*
>)
{
if
(
firstConstrainIndex
==
-
1
)
{
firstConstrainIndex
=
list
.
size
// we are going to add one
...
...
@@ -477,14 +466,24 @@ internal fun Iterable<SingleMessage>.constrainSingleMessages(): List<SingleMessa
val
index
=
list
.
indexOfFirst
(
firstConstrainIndex
)
{
it
is
ConstrainSingle
<
*
>
&&
it
.
key
==
key
}
if
(
index
!=
-
1
)
{
list
[
index
]
=
singleMessage
continue
return
@
let
}
}
}
list
.
add
(
singleMessage
)
}
?:
return
list
}
while
(
true
)
}
@OptIn
(
MiraiExperimentalAPI
::
class
)
internal
fun
Iterable
<
SingleMessage
>.
constrainSingleMessages
():
List
<
SingleMessage
>
{
val
iterator
=
this
.
iterator
()
return
constrainSingleMessagesImpl
supplier
@
{
if
(
iterator
.
hasNext
())
{
iterator
.
next
()
}
else
null
}
return
list
}
internal
inline
fun
<
T
>
List
<
T
>.
indexOfFirst
(
offset
:
Int
,
predicate
:
(
T
)
->
Boolean
):
Int
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment