github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'quahu/dev' into dev

Browse Source
This commit is contained in:
Christopher Felegy
2019-06-05 17:07:42 -04:00
parent 3e65e03b85 7457847489
commit 8fb0d5dc13
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/Discord.Net.Commands/CommandParser.cs
View File

@@ -53,6 +53,13 @@ namespace Discord.Commands
else
c = '\0';
//If we're processing a remainder parameter, ignore all other logic
if (curParam != null && curParam.IsRemainder && curPos != endPos)
{
argBuilder.Append(c);
continue;
}
//If this character is escaped, skip it
if (isEscaping)
{
@@ -79,13 +86,6 @@ namespace Discord.Commands
continue;
}
//If we're processing an remainder parameter, ignore all other logic
if (curParam != null && curParam.IsRemainder && curPos != endPos)
{
argBuilder.Append(c);
continue;
}
//If we're not currently processing one, are we starting the next argument yet?
if (curPart == ParserPart.None)
{
@@ -114,6 +114,23 @@ namespace Discord.Commands
}
}
//If this character is escaped, skip it
if (isEscaping)
{
if (curPos != endPos)
{
argBuilder.Append(c);
isEscaping = false;
continue;
}
}
//Are we escaping the next character?
if (c == '\\' && (curParam == null || !curParam.IsRemainder))
{
isEscaping = true;
continue;
}
//Has this parameter ended yet?
string argString = null;
if (curPart == ParserPart.Parameter)