提交 db2983bf 编写于 作者: C Cyrus Najmabadi

Cleaner solution

上级 b705102c
...@@ -1515,7 +1515,6 @@ class Bar { }"; ...@@ -1515,7 +1515,6 @@ class Bar { }";
XmlDoc.Text(" "), XmlDoc.Text(" "),
XmlDoc.Delimiter("<"), XmlDoc.Delimiter("<"),
XmlDoc.Name("summary"), XmlDoc.Name("summary"),
XmlDoc.Delimiter(" "),
XmlDoc.Delimiter("/>"), XmlDoc.Delimiter("/>"),
Keyword("class"), Keyword("class"),
Class("Bar"), Class("Bar"),
...@@ -1571,7 +1570,6 @@ class Bar { }"; ...@@ -1571,7 +1570,6 @@ class Bar { }";
XmlDoc.AttributeQuotes(@""""), XmlDoc.AttributeQuotes(@""""),
XmlDoc.AttributeValue(@"value"), XmlDoc.AttributeValue(@"value"),
XmlDoc.AttributeQuotes(@""""), XmlDoc.AttributeQuotes(@""""),
XmlDoc.Delimiter(" "),
XmlDoc.Delimiter("/>"), XmlDoc.Delimiter("/>"),
Keyword("class"), Keyword("class"),
Class("Bar"), Class("Bar"),
...@@ -1593,13 +1591,10 @@ class Bar { }"; ...@@ -1593,13 +1591,10 @@ class Bar { }";
XmlDoc.Delimiter("<"), XmlDoc.Delimiter("<"),
XmlDoc.Name("summary"), XmlDoc.Name("summary"),
XmlDoc.AttributeName("attribute"), XmlDoc.AttributeName("attribute"),
XmlDoc.Delimiter(" "),
XmlDoc.Delimiter("="), XmlDoc.Delimiter("="),
XmlDoc.AttributeQuotes(" "),
XmlDoc.AttributeQuotes(@""""), XmlDoc.AttributeQuotes(@""""),
XmlDoc.AttributeValue(@"value"), XmlDoc.AttributeValue(@"value"),
XmlDoc.AttributeQuotes(@""""), XmlDoc.AttributeQuotes(@""""),
XmlDoc.Delimiter(" "),
XmlDoc.Delimiter("/>"), XmlDoc.Delimiter("/>"),
Keyword("class"), Keyword("class"),
Class("Bar"), Class("Bar"),
...@@ -1696,7 +1691,6 @@ class C { }"; ...@@ -1696,7 +1691,6 @@ class C { }";
XmlDoc.Name("b"), XmlDoc.Name("b"),
XmlDoc.Text(","), XmlDoc.Text(","),
XmlDoc.Text("c"), XmlDoc.Text("c"),
XmlDoc.Delimiter(" "),
XmlDoc.Delimiter("/>"), XmlDoc.Delimiter("/>"),
XmlDoc.Text("."), XmlDoc.Text("."),
XmlDoc.Delimiter("///"), XmlDoc.Delimiter("///"),
......
...@@ -75,14 +75,6 @@ private void ClassifyXmlTrivia(SyntaxTriviaList triviaList, string? whitespaceCl ...@@ -75,14 +75,6 @@ private void ClassifyXmlTrivia(SyntaxTriviaList triviaList, string? whitespaceCl
ClassifyExteriorTrivia(t); ClassifyExteriorTrivia(t);
break; break;
case SyntaxKind.WhitespaceTrivia:
if (whitespaceClassificationType != null)
{
AddClassification(t, whitespaceClassificationType);
}
break;
case SyntaxKind.SkippedTokensTrivia: case SyntaxKind.SkippedTokensTrivia:
AddClassification(t, ClassificationTypeNames.XmlDocCommentText); AddClassification(t, ClassificationTypeNames.XmlDocCommentText);
break; break;
...@@ -138,16 +130,12 @@ private void ClassifyExteriorTrivia(SyntaxTrivia trivia) ...@@ -138,16 +130,12 @@ private void ClassifyExteriorTrivia(SyntaxTrivia trivia)
private void AddXmlClassification(SyntaxToken token, string classificationType) private void AddXmlClassification(SyntaxToken token, string classificationType)
{ {
if (token.HasLeadingTrivia) if (token.HasLeadingTrivia)
{
ClassifyXmlTrivia(token.LeadingTrivia, classificationType); ClassifyXmlTrivia(token.LeadingTrivia, classificationType);
}
AddClassification(token, classificationType); AddClassification(token, classificationType);
if (token.HasTrailingTrivia) if (token.HasTrailingTrivia)
{
ClassifyXmlTrivia(token.TrailingTrivia, classificationType); ClassifyXmlTrivia(token.TrailingTrivia, classificationType);
}
} }
private void ClassifyXmlTextTokens(SyntaxTokenList textTokens) private void ClassifyXmlTextTokens(SyntaxTokenList textTokens)
...@@ -210,22 +198,11 @@ private void ClassifyXmlName(XmlNameSyntax node) ...@@ -210,22 +198,11 @@ private void ClassifyXmlName(XmlNameSyntax node)
var prefix = node.Prefix; var prefix = node.Prefix;
if (prefix != null) if (prefix != null)
{ {
AddXmlNameTokenClassification(prefix.Prefix, classificationType); AddXmlClassification(prefix.Prefix, classificationType);
AddXmlNameTokenClassification(prefix.ColonToken, classificationType); AddXmlClassification(prefix.ColonToken, classificationType);
} }
AddXmlNameTokenClassification(node.LocalName, classificationType); AddXmlClassification(node.LocalName, classificationType);
}
private void AddXmlNameTokenClassification(SyntaxToken token, string classificationType)
{
if (token.HasLeadingTrivia)
ClassifyXmlTrivia(token.LeadingTrivia, whitespaceClassificationType: null);
AddClassification(token, classificationType);
if (token.HasTrailingTrivia)
ClassifyXmlTrivia(token.TrailingTrivia, whitespaceClassificationType: null);
} }
private void ClassifyXmlElement(XmlElementSyntax node) private void ClassifyXmlElement(XmlElementSyntax node)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册