Browse Source

Added create indexer action.

newNRvisualizers
Mike Krüger 14 years ago
parent
commit
9ec0d68db2
  1. 1
      ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
  2. 105
      ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateIndexerAction.cs
  3. 6
      ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateMethodDeclarationAction.cs
  4. 159
      ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateIndexerTests.cs
  5. 1
      ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj

1
ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj

@ -350,6 +350,7 @@ @@ -350,6 +350,7 @@
<Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\InconsistentNamingIssue.cs" />
<Compile Include="Refactoring\CodeActions\CreateMethodDeclarationAction.cs" />
<Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\NamingConventionService.cs" />
<Compile Include="Refactoring\CodeActions\CreateIndexerAction.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">

105
ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateIndexerAction.cs

@ -0,0 +1,105 @@ @@ -0,0 +1,105 @@
//
// CreateIndexerAction.cs
//
// Author:
// Mike Krüger <mkrueger@xamarin.com>
//
// Copyright (c) 2012 Xamarin <http://xamarin.com>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System.Collections.Generic;
using System.Linq;
using ICSharpCode.NRefactory.Semantics;
using ICSharpCode.NRefactory.TypeSystem;
using System.Text;
namespace ICSharpCode.NRefactory.CSharp.Refactoring
{
[ContextAction("Create indexer", Description = "Creates an indexer declaration out of an indexer expression.")]
public class CreateIndexerAction : ICodeActionProvider
{
public IEnumerable<CodeAction> GetActions(RefactoringContext context)
{
var indexer = context.GetNode<IndexerExpression>();
if (indexer == null) {
yield break;
}
if (!(context.Resolve(indexer).IsError)) {
yield break;
}
var state = context.GetResolverStateBefore(indexer);
var guessedType = CreateFieldAction.GuessAstType(context, indexer);
bool createInOtherType = false;
ResolveResult targetResolveResult = null;
targetResolveResult = context.Resolve(indexer.Target);
createInOtherType = !state.CurrentTypeDefinition.Equals(targetResolveResult.Type.GetDefinition());
bool isStatic;
if (createInOtherType) {
isStatic = targetResolveResult is TypeResolveResult;
if (isStatic && targetResolveResult.Type.Kind == TypeKind.Interface) {
yield break;
}
} else {
isStatic = indexer.Target is IdentifierExpression && state.CurrentMember.IsStatic;
}
yield return new CodeAction(context.TranslateString("Create indexer"), script => {
var decl = new IndexerDeclaration() {
ReturnType = guessedType,
Getter = new Accessor() {
Body = new BlockStatement() {
new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
}
},
Setter = new Accessor() {
Body = new BlockStatement() {
new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
}
},
};
foreach (var parameter in CreateMethodDeclarationAction.GenerateParameters (context, indexer.Arguments)) {
decl.Parameters.Add(parameter);
}
if (isStatic) {
decl.Modifiers |= Modifiers.Static;
}
if (createInOtherType) {
if (targetResolveResult.Type.Kind == TypeKind.Interface) {
decl.Getter.Body = null;
decl.Setter.Body = null;
decl.Modifiers = Modifiers.None;
} else {
decl.Modifiers |= Modifiers.Public;
}
script.InsertWithCursor(context.TranslateString("Create indexer"), decl, targetResolveResult.Type.GetDefinition());
return;
}
script.InsertWithCursor(context.TranslateString("Create indexer"), decl, Script.InsertPosition.Before);
});
}
}
}

6
ICSharpCode.NRefactory.CSharp/Refactoring/CodeActions/CreateMethodDeclarationAction.cs

@ -146,7 +146,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring @@ -146,7 +146,7 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
new ThrowStatement(new ObjectCreateExpression(context.CreateShortType("System", "NotImplementedException")))
}
};
foreach (var parameter in GenerateParameters (context, invocation)) {
foreach (var parameter in GenerateParameters (context, invocation.Arguments)) {
decl.Parameters.Add(parameter);
}
if (isStatic) {
@ -170,10 +170,10 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring @@ -170,10 +170,10 @@ namespace ICSharpCode.NRefactory.CSharp.Refactoring
});
}
public IEnumerable<ParameterDeclaration> GenerateParameters(RefactoringContext context, InvocationExpression invocation)
public static IEnumerable<ParameterDeclaration> GenerateParameters(RefactoringContext context, IEnumerable<Expression> arguments)
{
Dictionary<string, int> nameCounter = new Dictionary<string, int>();
foreach (var argument in invocation.Arguments) {
foreach (var argument in arguments) {
ParameterModifier direction = ParameterModifier.None;
AstNode node;
if (argument is DirectionExpression) {

159
ICSharpCode.NRefactory.Tests/CSharp/CodeActions/CreateIndexerTests.cs

@ -0,0 +1,159 @@ @@ -0,0 +1,159 @@
//
// CreateIndexerTests.cs
//
// Author:
// Mike Krüger <mkrueger@xamarin.com>
//
// Copyright (c) 2012 Xamarin <http://xamarin.com>
//
// Permission is hereby granted, free of charge, to any person obtaining a copy
// of this software and associated documentation files (the "Software"), to deal
// in the Software without restriction, including without limitation the rights
// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
// copies of the Software, and to permit persons to whom the Software is
// furnished to do so, subject to the following conditions:
//
// The above copyright notice and this permission notice shall be included in
// all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
using System;
using NUnit.Framework;
using ICSharpCode.NRefactory.CSharp.Refactoring;
namespace ICSharpCode.NRefactory.CSharp.CodeActions
{
[TestFixture]
public class CreateIndexerTests : ContextActionTestBase
{
public void TestCreateIndexer (string input, string output)
{
string result = RunContextAction (new CreateIndexerAction (), CreateMethodDeclarationTests.HomogenizeEol (input));
bool passed = result == output;
if (!passed) {
Console.WriteLine ("-----------Expected:");
Console.WriteLine (output);
Console.WriteLine ("-----------Got:");
Console.WriteLine (result);
}
Assert.AreEqual (CreateMethodDeclarationTests.HomogenizeEol (output), result);
}
[Test()]
public void TestIndexer ()
{
TestCreateIndexer (
@"
class TestClass
{
void TestMethod ()
{
$this[0] = 2;
}
}
", @"
class TestClass
{
int this [int i] {
get {
throw new System.NotImplementedException ();
}
set {
throw new System.NotImplementedException ();
}
}
void TestMethod ()
{
this[0] = 2;
}
}
");
}
[Test()]
public void TestInterfaceIndexer ()
{
TestCreateIndexer (
@"
interface FooBar
{
}
class TestClass
{
void TestMethod ()
{
FooBar fb;
$fb[0] = 2;
}
}
", @"
interface FooBar
{
int this [int i] {
get;
set;
}
}
class TestClass
{
void TestMethod ()
{
FooBar fb;
fb[0] = 2;
}
}
");
}
[Test()]
public void TestExternIndexer ()
{
TestCreateIndexer (
@"
class FooBar
{
}
class TestClass
{
void TestMethod ()
{
FooBar fb;
$fb[0] = 2;
}
}
", @"
class FooBar
{
public int this [int i] {
get {
throw new System.NotImplementedException ();
}
set {
throw new System.NotImplementedException ();
}
}
}
class TestClass
{
void TestMethod ()
{
FooBar fb;
fb[0] = 2;
}
}
");
}
}
}

1
ICSharpCode.NRefactory.Tests/ICSharpCode.NRefactory.Tests.csproj

@ -253,6 +253,7 @@ @@ -253,6 +253,7 @@
<Compile Include="CSharp\CodeActions\CreateFieldTests.cs" />
<Compile Include="CSharp\CodeActions\CreatePropertyTests.cs" />
<Compile Include="CSharp\CodeActions\CreateMethodDeclarationTests.cs" />
<Compile Include="CSharp\CodeActions\CreateIndexerTests.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Mono.Cecil\Mono.Cecil.csproj">

Loading…
Cancel
Save