提交 0a31f0c9 编写于 作者: C CyrusNajmabadi

Share more code.

上级 40c3ec2a
......@@ -455,17 +455,6 @@ private bool IsPartOfQueryExpression(SyntaxToken token)
// okay, looks like containing node is written over multiple lines, in that case, give same indentation as given token
return GetIndentationOfLine(givenTokenLine);
}
protected override bool HasPreprocessorCharacter(TextLine currentLine)
{
var text = currentLine.ToString();
Contract.Requires(!string.IsNullOrWhiteSpace(text));
var trimmedText = text.Trim();
Contract.Assert(SyntaxFacts.GetText(SyntaxKind.HashToken).Length == 1);
return trimmedText[0] == SyntaxFacts.GetText(SyntaxKind.HashToken)[0];
}
}
}
}
\ No newline at end of file
......@@ -11,6 +11,7 @@
using Microsoft.CodeAnalysis.Shared.Extensions;
using Microsoft.CodeAnalysis.Text;
using Microsoft.CodeAnalysis.Text.Shared.Extensions;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.Editor.Implementation.SmartIndent
{
......@@ -209,8 +210,6 @@ private TextSpan GetNormalizedSpan(int position)
return null;
}
protected abstract bool HasPreprocessorCharacter(TextLine currentLine);
protected int GetCurrentPositionNotBelongToEndOfFileToken(int position)
{
var compilationUnit = Tree.GetRoot(CancellationToken) as ICompilationUnitSyntax;
......@@ -221,6 +220,16 @@ protected int GetCurrentPositionNotBelongToEndOfFileToken(int position)
return Math.Min(compilationUnit.EndOfFileToken.FullSpan.Start, position);
}
protected bool HasPreprocessorCharacter(TextLine currentLine)
{
var text = currentLine.ToString();
Contract.Requires(!string.IsNullOrWhiteSpace(text));
var trimmedText = text.Trim();
return trimmedText[0] == '#';
}
}
}
}
\ No newline at end of file
......@@ -75,16 +75,6 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.Formatting.Indentation
Return token.GetPreviousToken()
End Function
Protected Overrides Function HasPreprocessorCharacter(currentLine As TextLine) As Boolean
Dim text = currentLine.ToString()
Contract.Assert(String.IsNullOrWhiteSpace(text) = False)
Dim trimmedText = text.Trim()
Contract.Assert(SyntaxFacts.GetText(SyntaxKind.HashToken).Length = 1)
Return trimmedText(0) = SyntaxFacts.GetText(SyntaxKind.HashToken)(0)
End Function
Private Function GetIndentationBasedOnToken(token As SyntaxToken, Optional trivia As SyntaxTrivia = Nothing) As IndentationResult?
Dim sourceText = LineToBeIndented.Text
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册