Siegfried Pammer 15 years ago
parent
commit
8cdeb9b897
  1. 2
      src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs
  2. 29
      src/AddIns/BackendBindings/VBNetBinding/Test/FormattingStrategy/EndSubTests.cs

2
src/AddIns/BackendBindings/VBNetBinding/Project/Src/FormattingStrategy/VBNetFormattingStrategy.cs

@ -83,7 +83,7 @@ namespace ICSharpCode.VBNetBinding @@ -83,7 +83,7 @@ namespace ICSharpCode.VBNetBinding
new int[] {
Tokens.Class, Tokens.Module, Tokens.Namespace, Tokens.Interface, Tokens.Structure,
Tokens.Sub, Tokens.Function, Tokens.Operator, Tokens.Enum,
Tokens.If, Tokens.For, Tokens.Do, Tokens.While, Tokens.With, Tokens.Select, Tokens.Try,
Tokens.If, Tokens.For, Tokens.Do, Tokens.While, Tokens.With, Tokens.Select, Tokens.Try, Tokens.Using,
Tokens.Property, Tokens.Get, Tokens.Set
});
#endregion

29
src/AddIns/BackendBindings/VBNetBinding/Test/FormattingStrategy/EndSubTests.cs

@ -88,6 +88,35 @@ namespace ICSharpCode.VBNetBinding.Tests @@ -88,6 +88,35 @@ namespace ICSharpCode.VBNetBinding.Tests
RunTest(code, cursorOffset, expectedCode, expectedOffset, '\n');
}
[Test]
public void EndUsing()
{
string code = "Public Class Foo\r\n" +
"\tPublic Sub Bar\r\n" +
"\t\tUsing a As New StreamReader()\r\n" +
"\r\n" + // This extra new line is required. This is the new line just entered by the user.
"\tEnd Sub\r\n" +
"End Class";
string bar = "Using a As New StreamReader()\r\n";
int cursorOffset = code.IndexOf(bar) + bar.Length;
string expectedCode = "Public Class Foo\r\n" +
"\tPublic Sub Bar\r\n" +
"\t\tUsing a As New StreamReader()\r\n" +
"\t\t\t\r\n" +
"\t\tEnd Using\r\n" +
"\tEnd Sub\r\n" +
"End Class";
int expectedOffset = ("Public Class Foo\r\n" +
"\tPublic Sub Bar\r\n" +
"\t\tUsing a As New StreamReader()\r\n" +
"\t\t\t").Length;
RunTest(code, cursorOffset, expectedCode, expectedOffset, '\n');
}
[Test]
public void SingleLineIf()
{

Loading…
Cancel
Save