Skip to content

Commit

Permalink
inserting overrides inserts a new line fixes #106
Browse files Browse the repository at this point in the history
  • Loading branch information
nosami committed Sep 22, 2014
1 parent 2a1abfe commit db5e841
Show file tree
Hide file tree
Showing 6 changed files with 47 additions and 37 deletions.
2 changes: 1 addition & 1 deletion NRefactory
Submodule NRefactory updated 34 files
+6 −6 ...e.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToDisposedClosureIssue.cs
+6 −6 ...e.NRefactory.CSharp.Refactoring/CodeIssues/NotWorking/AccessToClosureIssues/AccessToModifiedClosureIssue.cs
+7 −9 ....NRefactory.CSharp.Refactoring/CodeIssues/Synced/ConstraintViolations/InconsistentNamingIssue/NamingRule.cs
+1 −1 ...de.NRefactory.CSharp.Refactoring/CodeIssues/Synced/RedundanciesInCode/RedundantAttributeParenthesesIssue.cs
+4 −4 ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/AutoAsyncIssue.cs
+4 −4 ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DisposeMethodInNonIDisposableTypeIssue.cs
+4 −4 ...Code.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DontUseLinqWhenItsVerboseAndInefficientIssue.cs
+4 −4 ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/DuplicatedLinqToListOrArrayIssue.cs
+5 −5 ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExceptionRethrowIssue.cs
+4 −4 ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ExplicitConversionInForEachIssue.cs
+5 −5 ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/IncorrectCallToObjectGetHashCodeIssue.cs
+5 −5 ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantBlockInDifferentBranchesIssue.cs
+4 −4 ...e.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/RedundantNotNullAttributeInNonNullableTypeIssue.cs
+5 −5 ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/ResultOfAsyncCallShouldNotBeIgnoredIssue.cs
+4 −4 ...NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/SameGuardConditionExpressionInIfelseBranchesIssue.cs
+5 −5 ...de.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UnmatchedSizeSpecificationInArrayCreationIssue.cs
+4 −4 ICSharpCode.NRefactory.CSharp.Refactoring/CodeIssues/Uncategorized/UseOfMemberOfNullReference.cs
+3 −6 ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngine.cs
+1 −1 ICSharpCode.NRefactory.CSharp/Completion/CSharpCompletionEngineBase.cs
+5 −2 ICSharpCode.NRefactory.CSharp/Completion/CSharpParameterCompletionEngine.cs
+6 −12 ICSharpCode.NRefactory.CSharp/IndentEngine/IndentState.cs
+0 −2 ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
+751 −772 ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
+5 −6 ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.jay
+1 −2 ICSharpCode.NRefactory.CSharp/Resolver/CSharpResolver.cs
+1 −3 ICSharpCode.NRefactory.CSharp/Resolver/ResolveAtLocation.cs
+1 −82 ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/ObjectInitializerTests.cs
+1 −18 ICSharpCode.NRefactory.Tests/CSharp/CodeCompletion/ParameterCompletionTests.cs
+1 −13 ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/InconsistentNamingTests.cs
+0 −1 ICSharpCode.NRefactory.Tests/CSharp/CodeIssues/UnmatchedSizeSpeicificationInArrayCreationTests.cs
+0 −19 ICSharpCode.NRefactory.Tests/CSharp/Parser/Bugs/ParserBugTests.cs
+3 −178 ICSharpCode.NRefactory.Tests/IndentationTests/BlockTest.cs
+1 −5 ICSharpCode.NRefactory/Completion/CompletionExtensionMethods.cs
+0 −2 ICSharpCode.NRefactory/TypeSystem/Implementation/GetClassTypeReference.cs
35 changes: 34 additions & 1 deletion OmniSharp.Tests/Overrides/TestOverrideContext.cs
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
using System.Linq;
using NUnit.Framework;
using Should;
using OmniSharp.Common;
using OmniSharp.Overrides;
using OmniSharp.Parser;
using OmniSharp.Tests.Rename;
using OmniSharp.Configuration;

namespace OmniSharp.Tests.Overrides
{
[TestFixture]
public class TestOverrideContext
public class OverridesTest
{
[Test]
public void Should_not_offer_already_overridden_method()
Expand All @@ -32,5 +34,36 @@ public override string ToString()
overrides.ShouldNotContain("public virtual string ToString ();");

}

[Test]
public void Should_insert_stub_method_override()
{
var buffer =
@"
public class WeirdString : String
{
$
}";
var location = TestHelpers.GetLineAndColumnFromDollar(buffer);
buffer = buffer.Replace("$","");
var request = new RunOverrideTargetRequest { Buffer = buffer, FileName = "myfile.cs", Line = location.Line, Column = location.Column };
var solution = new FakeSolutionBuilder().AddFile(buffer, "myfile.cs").Build();
var parser = new BufferParser(solution);
var handler = new OverrideHandler (parser, new OmniSharpConfiguration ());
request.OverrideTargetName = "public virtual string ToString ();";
var response = handler.RunOverrideTarget (request);
string expected =
@"
public class WeirdString : String
{
public override string ToString()
{
throw new System.NotImplementedException();
}
}";
string result = response.Buffer.Replace ("\r\n", "\n");
result.ShouldEqual(expected);
}
}
}
1 change: 1 addition & 0 deletions OmniSharp/Configuration/OmniSharpConfiguration.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ public OmniSharpConfiguration()
PathReplacements = new List<PathReplacement>();
IgnoredCodeIssues = new List<string>();
TextEditorOptions = new TextEditorOptions ();
TextEditorOptions.TabsToSpaces = true;
CSharpFormattingOptions = FormattingOptionsFactory.CreateAllman();
}

Expand Down
8 changes: 4 additions & 4 deletions OmniSharp/Overrides/OverrideHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,11 @@ IDocument runOverrideTargetWorker
, n => n.NodeType == NodeType.TypeDeclaration);

// Even empty classes have nodes, so this works
var memberBeforeClosingBraceNode =
typeDeclaration.Children.Last().GetPrevNode();
var lastNode =
typeDeclaration.Children.Last();

script.InsertAfter
( node : memberBeforeClosingBraceNode
script.InsertBefore
( node : lastNode
, newNode : memberDeclaration);
script.FormatText(memberDeclaration);

Expand Down
27 changes: 0 additions & 27 deletions OmniSharp/SyntaxErrors/SyntaxErrorsHandler.cs

This file was deleted.

1 change: 1 addition & 0 deletions OmniSharp/SyntaxErrors/SyntaxErrorsHandler.cs
10 changes: 6 additions & 4 deletions packages/repositories.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="..\Omnisharp.Tests\packages.config" />
<repository path="..\OmniSharp\packages.config" />
<?xml version="1.0" encoding="utf-8"?>
<repositories>
<repository path="../OmniSharp.Tests/packages.config" />
<repository path="../OmniSharp/packages.config" />
<repository path="..\Omnisharp.Tests\packages.config" />
<repository path="..\OmniSharp\packages.config" />
</repositories>

0 comments on commit db5e841

Please sign in to comment.