Fixes issues #38.

Abc-Arbitrage · Feb 29, 2024 · 82cdd96 · 82cdd96
1 parent d2f7858
commit 82cdd96
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 76 deletions.
diff --git a/Abc.MoqComplete/Abc.MoqComplete.Tests/ContextAction/Services/ParameterProviderTests.cs b/Abc.MoqComplete/Abc.MoqComplete.Tests/ContextAction/Services/ParameterProviderTests.cs
diff --git a/...oqComplete/Abc.MoqComplete.Tests/data/ContextAction/fill_primary_constructor_with_mock.cs b/...oqComplete/Abc.MoqComplete.Tests/data/ContextAction/fill_primary_constructor_with_mock.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using System;
+using Moq;
+
+namespace ConsoleApp1.Tests
+{
+    public class Test1(ITest test, ITest2 test2)
+    {
+
+        public interface ITest
+        {
+            void Coco(ITest test, ITest test2, string test3);
+        }
+        public interface ITest2
+        {
+        }
+    }
+
+    [TestFixture]
+    public class TestClass
+    {
+        [Test]
+        public void METHOD()
+        {
+            var t = new Test1({ caret });
+        }
+    }
+}
diff --git a/...plete/Abc.MoqComplete.Tests/data/ContextAction/fill_primary_constructor_with_mock.cs.gold b/...plete/Abc.MoqComplete.Tests/data/ContextAction/fill_primary_constructor_with_mock.cs.gold
@@ -0,0 +1,33 @@
+using NUnit.Framework;
+using System;
+using Moq;
+
+namespace ConsoleApp1.Tests
+{
+    public class Test1(ITest test, ITest2 test2)
+    {
+
+        public interface ITest
+        {
+            void Coco(ITest test, ITest test2, string test3);
+        }
+        public interface ITest2
+        {
+        }
+    }
+
+    [TestFixture]
+    public class TestClass
+    {
+      private Mock<ITest> myTest;
+      private Mock<ITest2> myTest2;
+
+      [Test]
+        public void METHOD()
+        {
+          myTest = new Mock<ITest>();
+          myTest2 = new Mock<ITest2>();
+          var t = new Test1(myTest.Object, myTest2.Object{caret});
+        }
+    }
+}
diff --git a/...MoqComplete/Abc.MoqComplete/ContextActions/FillWithMock/FillParamWithMockContextAction.cs b/...MoqComplete/Abc.MoqComplete/ContextActions/FillWithMock/FillParamWithMockContextAction.cs
@@ -111,7 +111,7 @@ public override bool IsAvailable(IUserDataHolder cache)
         protected override Action<ITextControl> ExecutePsiTransaction(ISolution solution, IProgressIndicator progress)
         {
             var argumentList = _selectedElement.ArgumentList;
-            var parameters = _csharpMemberProvider.GetConstructorParameters(_constructor.ToString()).ToArray();
+            var parameters = _csharpMemberProvider.GetConstructorParameters(_constructor).ToArray();
             var mockFieldsByType = _csharpMemberProvider.GetClassFields(_classBody, _selectedElement.Language);
             var shortName = _constructor.Parameters[_parameterNumber].ShortName;
             var currentParam = parameters[_parameterNumber];

diff --git a/...bc.MoqComplete/ContextActions/FillWithMock/FillParamWithMockLocalVariableContextAction.cs b/...bc.MoqComplete/ContextActions/FillWithMock/FillParamWithMockLocalVariableContextAction.cs
@@ -49,7 +49,7 @@ protected override Action<ITextControl> ExecutePsiTransaction(ISolution solution
             var @class = (IClass)selectedElement.TypeReference?.Resolve().DeclaredElement;
             var parameterCount = selectedElement.ArgumentList?.Arguments.Count(x => x.Kind != ParameterKind.UNKNOWN);
             var constructor = @class.Constructors.ToArray().FirstOrDefault(x => !x.IsParameterless && x.Parameters.Count > parameterCount);
-            var parameters = csharpMemberProvider.GetConstructorParameters(constructor.ToString()).ToArray();
+            var parameters = csharpMemberProvider.GetConstructorParameters(constructor).ToArray();
             var parameterNumber = csharpMemberProvider.GetCurrentParameterNumber(selectedElement, _dataProvider);
             var shortName = constructor.Parameters[parameterNumber].ShortName;
             var currentParam = parameters[parameterNumber];

diff --git a/...oqComplete/Abc.MoqComplete/ContextActions/FillWithMock/FillWithMockFieldsContextAction.cs b/...oqComplete/Abc.MoqComplete/ContextActions/FillWithMock/FillWithMockFieldsContextAction.cs
@@ -58,7 +58,7 @@ public override bool IsAvailable(IUserDataHolder cache)
                                                             && x.Parameters.All(_csharpMemberProvider.IsAbstractOrInterface));
             if (_constructor == null)
                 return false;
-
+            
             var isAvailable = testProjectProvider.IsTestProject(_dataProvider.PsiModule) && _selectedElement != null && _selectedElement.Arguments.Count == 0;
             if (isAvailable)
                 cache.PutKey(AnchorKey.FillWithMockContextActionKey);
@@ -75,7 +75,7 @@ protected override Action<ITextControl> ExecutePsiTransaction(ISolution solution
             if (classDeclaration == null || block == null)
                 return null;
 
-            var parameters = _csharpMemberProvider.GetConstructorParameters(_constructor.ToString()).ToArray();
+            var parameters = _csharpMemberProvider.GetConstructorParameters(_constructor).ToArray();
             var naming = _dataProvider.PsiServices.Naming;
             var mockFieldsByType = _csharpMemberProvider.GetClassFields(classBody, _selectedElement.Language);
 

diff --git a/...ete/Abc.MoqComplete/ContextActions/FillWithMock/FillWithMockLocalVariableContextAction.cs b/...ete/Abc.MoqComplete/ContextActions/FillWithMock/FillWithMockLocalVariableContextAction.cs
@@ -54,7 +54,7 @@ protected override Action<ITextControl> ExecutePsiTransaction(ISolution solution
             if (constructor == null)
                 return null;
 
-            var parameters = _csharpMemberProvider.GetConstructorParameters(constructor.ToString()).ToArray();
+            var parameters = _csharpMemberProvider.GetConstructorParameters(constructor).ToArray();
 
             for (int i = 0; i < constructor.Parameters.Count; i++)
             {

diff --git a/Abc.MoqComplete/Abc.MoqComplete/ContextActions/Services/CsharpMemberProvider.cs b/Abc.MoqComplete/Abc.MoqComplete/ContextActions/Services/CsharpMemberProvider.cs
@@ -6,6 +6,7 @@
 using JetBrains.ReSharper.Feature.Services.CSharp.ContextActions;
 using JetBrains.ReSharper.Psi;
 using JetBrains.ReSharper.Psi.CSharp.Tree;
+using JetBrains.ReSharper.Psi.Util;
 using JetBrains.TextControl;
 using JetBrains.Util;
 
@@ -14,34 +15,7 @@ namespace Abc.MoqComplete.ContextActions.Services
     [SolutionComponent]
     public class CsharpMemberProvider : ICsharpMemberProvider
     {
-        public IEnumerable<string> GetConstructorParameters(string constructorString)
-        {
-            var index = 0;
-            var openedBracket = 0;
-
-            while (constructorString[index] != '(')
-                index++;
-
-            var sb = new StringBuilder();
-            while (constructorString[index] != ')')
-            {
-                index++;
-
-                if (constructorString[index] == '<')
-                    openedBracket++;
-
-                else if (constructorString[index] == '>')
-                    openedBracket--;
-
-                if (openedBracket ==0 && (constructorString[index] == ',' || constructorString[index] == ')'))
-                {
-                    yield return sb.ToString();
-                    sb.Clear();
-                }
-                else
-                    sb.Append(constructorString[index]);
-            }
-        }
+        public IEnumerable<string> GetConstructorParameters(IConstructor constructor) => constructor.Parameters.Select(s => s.Type.GetPresentableName(constructor.PresentationLanguage));
 
         public Dictionary<string, string> GetClassFields(IClassBody classBody, PsiLanguageType languageType)
         {

diff --git a/Abc.MoqComplete/Abc.MoqComplete/ContextActions/Services/ICsharpMemberProvider.cs b/Abc.MoqComplete/Abc.MoqComplete/ContextActions/Services/ICsharpMemberProvider.cs
@@ -9,7 +9,7 @@ namespace Abc.MoqComplete.ContextActions.Services
 {
     public interface ICsharpMemberProvider
     {
-        IEnumerable<string> GetConstructorParameters(string constructorString);
+        IEnumerable<string> GetConstructorParameters(IConstructor constructor);
         Dictionary<string, string> GetClassFields(IClassBody classBody, PsiLanguageType languageType);
         string GetGenericMock(string typeStr);
         bool IsAbstractOrInterface(IParameter parameter);