diff --git a/src/AddIns/BackendBindings/Python/PyWalker/PyWalker.csproj b/src/AddIns/BackendBindings/Python/PyWalker/PyWalker.csproj index 9e2a0444fe..71f993685b 100644 --- a/src/AddIns/BackendBindings/Python/PyWalker/PyWalker.csproj +++ b/src/AddIns/BackendBindings/Python/PyWalker/PyWalker.csproj @@ -1,4 +1,5 @@ - + + {55329704-6046-48EC-8A20-5C80B3092A63} Debug @@ -49,9 +50,6 @@ ..\RequiredLibraries\Microsoft.Scripting.dll - - ..\RequiredLibraries\Microsoft.Scripting.Core.dll - diff --git a/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Python.Build.Tasks.csproj b/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Python.Build.Tasks.csproj index 8f64be7890..2eb47f40f7 100644 --- a/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Python.Build.Tasks.csproj +++ b/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Python.Build.Tasks.csproj @@ -1,4 +1,5 @@ - + + {D332F2D1-2CF1-43B7-903C-844BD5211A7E} Debug @@ -10,7 +11,7 @@ False 4 false - v3.5 + v4.0 OnBuildSuccess @@ -55,9 +56,6 @@ ..\..\RequiredLibraries\Microsoft.Scripting.dll - - ..\..\RequiredLibraries\Microsoft.Scripting.Core.dll - diff --git a/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Src/IPythonCompiler.cs b/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Src/IPythonCompiler.cs index 9272cfc0d4..ffc85e6ca9 100644 --- a/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Src/IPythonCompiler.cs +++ b/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Project/Src/IPythonCompiler.cs @@ -9,7 +9,6 @@ using System; using System.Collections.Generic; using System.Reflection; using System.Reflection.Emit; -using IronPython.Hosting; namespace ICSharpCode.Python.Build.Tasks { diff --git a/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Test/Python.Build.Tasks.Tests.csproj b/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Test/Python.Build.Tasks.Tests.csproj index 65bde63b26..821f3c1e93 100644 --- a/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Test/Python.Build.Tasks.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/Python.Build.Tasks/Test/Python.Build.Tasks.Tests.csproj @@ -1,4 +1,5 @@ - + + {833904AB-3CD4-4071-9B48-5770E44685AA} Debug @@ -10,7 +11,7 @@ False 4 false - v3.5 + v4.0 ..\..\..\..\..\..\bin\UnitTests\ @@ -39,7 +40,6 @@ ..\..\RequiredLibraries\IronPython.dll - False @@ -53,9 +53,6 @@ ..\..\RequiredLibraries\Microsoft.Scripting.dll - - ..\..\RequiredLibraries\Microsoft.Scripting.Core.dll - ..\..\..\..\..\Tools\NUnit\nunit.framework.dll False diff --git a/src/AddIns/BackendBindings/Python/PythonBinding.sln b/src/AddIns/BackendBindings/Python/PythonBinding.sln index b1ea933214..c0bb7b11c1 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding.sln +++ b/src/AddIns/BackendBindings/Python/PythonBinding.sln @@ -1,35 +1,41 @@  Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 10 -# SharpDevelop 4.0.0.5076 +# Visual Studio 2010 +# SharpDevelop 4.0.0.5293 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding", "PythonBinding\Project\PythonBinding.csproj", "{8D732610-8FC6-43BA-94C9-7126FD7FE361}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PythonBinding.Tests", "PythonBinding\Test\PythonBinding.Tests.csproj", "{23B517C9-1ECC-4419-A13F-0B7136D085CB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "..\..\..\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks.Tests", "Python.Build.Tasks\Test\Python.Build.Tasks.Tests.csproj", "{833904AB-3CD4-4071-9B48-5770E44685AA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.TextEditor", "..\..\..\Libraries\ICSharpCode.TextEditor\Project\ICSharpCode.TextEditor.csproj", "{2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "..\..\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.AvalonEdit", "..\..\..\Libraries\AvalonEdit\ICSharpCode.AvalonEdit\ICSharpCode.AvalonEdit.csproj", "{6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NRefactory", "..\..\..\Libraries\NRefactory\Project\NRefactory.csproj", "{3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks", "Python.Build.Tasks\Project\Python.Build.Tasks.csproj", "{D332F2D1-2CF1-43B7-903C-844BD5211A7E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Python.Build.Tasks.Tests", "Python.Build.Tasks\Test\Python.Build.Tasks.Tests.csproj", "{833904AB-3CD4-4071-9B48-5770E44685AA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core", "..\..\..\Main\Core\Project\ICSharpCode.Core.csproj", "{35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.Presentation", "..\..\..\Main\ICSharpCode.Core.Presentation\ICSharpCode.Core.Presentation.csproj", "{7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PyWalker", "PyWalker\PyWalker.csproj", "{55329704-6046-48EC-8A20-5C80B3092A63}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Core.WinForms", "..\..\..\Main\ICSharpCode.Core.WinForms\ICSharpCode.Core.WinForms.csproj", "{857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FormsDesigner", "..\..\DisplayBindings\FormsDesigner\Project\FormsDesigner.csproj", "{7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Dom", "..\..\..\Main\ICSharpCode.SharpDevelop.Dom\Project\ICSharpCode.SharpDevelop.Dom.csproj", "{924EE450-603D-49C1-A8E5-4AFAA31CE6F3}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop.Widgets", "..\..\..\Main\ICSharpCode.SharpDevelop.Widgets\Project\ICSharpCode.SharpDevelop.Widgets.csproj", "{8035765F-D51F-4A0C-A746-2FD100E19419}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AvalonEdit.AddIn", "..\..\DisplayBindings\AvalonEdit.AddIn\AvalonEdit.AddIn.csproj", "{0162E499-42D0-409B-AA25-EED21F75336B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU Release|Any CPU = Release|Any CPU + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8D732610-8FC6-43BA-94C9-7126FD7FE361}.Debug|Any CPU.Build.0 = Debug|Any CPU @@ -40,26 +46,6 @@ Global {23B517C9-1ECC-4419-A13F-0B7136D085CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {23B517C9-1ECC-4419-A13F-0B7136D085CB}.Release|Any CPU.Build.0 = Release|Any CPU {23B517C9-1ECC-4419-A13F-0B7136D085CB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.Build.0 = Release|Any CPU - {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.Build.0 = Release|Any CPU - {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.Build.0 = Release|Any CPU - {2D18BE89-D210-49EB-A9DD-2246FBB3DF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.Build.0 = Release|Any CPU - {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.Build.0 = Release|Any CPU - {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.ActiveCfg = Release|Any CPU {D332F2D1-2CF1-43B7-903C-844BD5211A7E}.Debug|Any CPU.Build.0 = Debug|Any CPU {D332F2D1-2CF1-43B7-903C-844BD5211A7E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D332F2D1-2CF1-43B7-903C-844BD5211A7E}.Release|Any CPU.Build.0 = Release|Any CPU @@ -68,17 +54,45 @@ Global {833904AB-3CD4-4071-9B48-5770E44685AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {833904AB-3CD4-4071-9B48-5770E44685AA}.Release|Any CPU.Build.0 = Release|Any CPU {833904AB-3CD4-4071-9B48-5770E44685AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.Build.0 = Release|Any CPU - {8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55329704-6046-48EC-8A20-5C80B3092A63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55329704-6046-48EC-8A20-5C80B3092A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55329704-6046-48EC-8A20-5C80B3092A63}.Release|Any CPU.Build.0 = Release|Any CPU - {55329704-6046-48EC-8A20-5C80B3092A63}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Release|Any CPU.Build.0 = Release|Any CPU {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.Build.0 = Release|Any CPU + {6C55B776-26D4-4DB3-A6AB-87E783B2F3D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.Build.0 = Release|Any CPU + {3A9AE6AA-BC07-4A2F-972C-581E3AE2F195}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.Build.0 = Release|Any CPU + {2748AD25-9C63-4E12-877B-4DCE96FBED54}.Release|Any CPU.ActiveCfg = Release|Any CPU + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.Build.0 = Release|Any CPU + {35CEF10F-2D4C-45F2-9DD1-161E0FEC583C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}.Release|Any CPU.Build.0 = Release|Any CPU + {7E4A7172-7FF5-48D0-B719-7CD959DD1AC9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|Any CPU.Build.0 = Debug|Any CPU + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|Any CPU.Build.0 = Release|Any CPU + {857CA1A3-FC88-4BE0-AB6A-D1EE772AB288}.Release|Any CPU.ActiveCfg = Release|Any CPU + {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.Build.0 = Release|Any CPU + {924EE450-603D-49C1-A8E5-4AFAA31CE6F3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8035765F-D51F-4A0C-A746-2FD100E19419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.Build.0 = Release|Any CPU + {8035765F-D51F-4A0C-A746-2FD100E19419}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0162E499-42D0-409B-AA25-EED21F75336B}.Release|Any CPU.Build.0 = Release|Any CPU + {0162E499-42D0-409B-AA25-EED21F75336B}.Release|Any CPU.ActiveCfg = Release|Any CPU EndGlobalSection EndGlobal diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj index 718dfec662..acc67e636b 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Project/PythonBinding.csproj @@ -1,4 +1,5 @@ - + + {8D732610-8FC6-43BA-94C9-7126FD7FE361} Debug @@ -43,18 +44,12 @@ ..\..\RequiredLibraries\IronPython.dll - - ..\..\RequiredLibraries\IronPython.Modules.dll - ..\..\RequiredLibraries\Microsoft.Dynamic.dll ..\..\RequiredLibraries\Microsoft.Scripting.dll - - ..\..\RequiredLibraries\Microsoft.Scripting.Core.dll - 3.5 diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateEventLogTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateEventLogTestFixture.cs index fde6ae217b..e3542871ad 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateEventLogTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Designer/GenerateEventLogTestFixture.cs @@ -38,30 +38,29 @@ namespace PythonBinding.Tests.Designer EventLog eventLog = (EventLog)host.CreateComponent(typeof(EventLog), "eventLog1"); DesignerSerializationManager serializationManager = new DesignerSerializationManager(host); - using (serializationManager.CreateSession()) { + using (serializationManager.CreateSession()) { PythonCodeDomSerializer serializer = new PythonCodeDomSerializer(" "); generatedPythonCode = serializer.GenerateInitializeComponentMethodBody(host, serializationManager, String.Empty, 1); } } } - [Test] - [IgnoreAttribute("Ignore test to fix the build - this test breaks for some reason on .NET 4.0")] public void GeneratedCode() { - string expectedCode = " self._eventLog1 = System.Diagnostics.EventLog()\r\n" + - " self.SuspendLayout()\r\n" + - " # \r\n" + - " # eventLog1\r\n" + - " # \r\n" + - " self._eventLog1.SynchronizingObject = self\r\n" + - " # \r\n" + - " # MainForm\r\n" + - " # \r\n" + - " self.ClientSize = System.Drawing.Size(284, 264)\r\n" + - " self.Name = \"MainForm\"\r\n" + - " self.ResumeLayout(False)\r\n"; + string expectedCode = + " self._eventLog1 = System.Diagnostics.EventLog()\r\n" + + " self.SuspendLayout()\r\n" + + " # \r\n" + + " # eventLog1\r\n" + + " # \r\n" + + " self._eventLog1.SynchronizingObject = self\r\n" + + " # \r\n" + + " # MainForm\r\n" + + " # \r\n" + + " self.ClientSize = System.Drawing.Size(284, 264)\r\n" + + " self.Name = \"MainForm\"\r\n" + + " self.ResumeLayout(False)\r\n"; Assert.AreEqual(expectedCode, generatedPythonCode, generatedPythonCode); } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/ImportCompletionTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/ImportCompletionTestFixture.cs index d443d666df..fed05e0396 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/ImportCompletionTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/ImportCompletionTestFixture.cs @@ -6,9 +6,11 @@ // using System; +using ICSharpCode.AvalonEdit; using ICSharpCode.Core; using ICSharpCode.PythonBinding; using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Editor; using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; using ICSharpCode.SharpDevelop.Dom; using ICSharpCode.SharpDevelop.Editor.AvalonEdit; @@ -73,10 +75,9 @@ namespace PythonBinding.Tests } [Test] - [Ignore("Broken since ITextEditor introduction")] public void TextAreaControlUsedToDisplayCodeCompletionWindow() { - Assert.AreSame(textEditor, codeCompletionBinding.TextAreaControlUsedToShowCompletionWindow); + Assert.AreSame(textEditor, codeCompletionBinding.TextEditorUsedToShowCompletionWindow); } [Test] diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseClassWithCtorTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseClassWithCtorTestFixture.cs index cce27f5590..d772c68321 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseClassWithCtorTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseClassWithCtorTestFixture.cs @@ -7,6 +7,11 @@ using System; using System.Collections.Generic; + +using ICSharpCode.AvalonEdit.AddIn; +using ICSharpCode.AvalonEdit.Document; +using ICSharpCode.AvalonEdit.Editing; +using ICSharpCode.AvalonEdit.Folding; using ICSharpCode.PythonBinding; using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; using ICSharpCode.SharpDevelop.Dom; @@ -22,14 +27,14 @@ namespace PythonBinding.Tests.Parsing /// was folded. This test fixture tests for that bug. /// [TestFixture] - [Ignore("Ignored because test depends on folding - reactivate when folding is reimplemented")] public class ParseClassWithCtorTestFixture { ICompilationUnit compilationUnit; IClass c; IMethod method; -// FoldMarker methodMarker; -// FoldMarker classMarker; + FoldingSection methodFold; + FoldingSection classFold; + TextDocument document; [TestFixtureSetUp] public void SetUpFixture() @@ -47,19 +52,22 @@ namespace PythonBinding.Tests.Parsing method = c.Methods[0]; } -// // Get folds. -// ParserFoldingStrategy foldingStrategy = new ParserFoldingStrategy(); -// ParseInformation parseInfo = new ParseInformation(compilationUnit); -// -// DocumentFactory docFactory = new DocumentFactory(); -// IDocument doc = docFactory.CreateDocument(); -// doc.TextContent = python; -// List markers = foldingStrategy.GenerateFoldMarkers(doc, @"C:\Temp\test.py", parseInfo); -// -// if (markers.Count > 1) { -// classMarker = markers[0]; -// methodMarker = markers[1]; -// } + // Get folds. + TextArea textArea = new TextArea(); + document = new TextDocument(); + textArea.Document = document; + textArea.Document.Text = python; + + ParserFoldingStrategy foldingStrategy = new ParserFoldingStrategy(textArea); + + ParseInformation parseInfo = new ParseInformation(compilationUnit); + foldingStrategy.UpdateFoldings(parseInfo); + List folds = new List(foldingStrategy.FoldingManager.AllFoldings); + + if (folds.Count > 1) { + classFold = folds[0]; + methodFold = folds[1]; + } } } @@ -75,10 +83,10 @@ namespace PythonBinding.Tests.Parsing } [Test] - [IgnoreAttribute] - public void MethodFoldMarkerInnerText() + public void MethodFoldTextInsideFoldIsMethodBody() { - //Assert.AreEqual("\r\n\t\tpass", methodMarker.InnerText); + string textInsideFold = document.GetText(methodFold.StartOffset, methodFold.Length); + Assert.AreEqual("\r\n\t\tpass", textInsideFold); } [Test] diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseClassWithMethodTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseClassWithMethodTestFixture.cs index 97b6736bfa..e2b8ce13f0 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseClassWithMethodTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseClassWithMethodTestFixture.cs @@ -7,6 +7,11 @@ using System; using System.Collections.Generic; + +using ICSharpCode.AvalonEdit.AddIn; +using ICSharpCode.AvalonEdit.Document; +using ICSharpCode.AvalonEdit.Editing; +using ICSharpCode.AvalonEdit.Folding; using ICSharpCode.PythonBinding; using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; using ICSharpCode.SharpDevelop.Dom; @@ -17,14 +22,14 @@ using PythonBinding.Tests; namespace PythonBinding.Tests.Parsing { [TestFixture] - [Ignore("Ignored because test depends on folding - reactivate when folding is reimplemented")] public class ParseClassWithMethodTestFixture { ICompilationUnit compilationUnit; IClass c; IMethod method; - FoldMarker methodMarker = null; - FoldMarker classMarker = null; + FoldingSection methodFold = null; + FoldingSection classFold = null; + TextDocument document; [TestFixtureSetUp] public void SetUpFixture() @@ -42,21 +47,23 @@ namespace PythonBinding.Tests.Parsing method = c.Methods[0]; } -// // Get folds. -// ParserFoldingStrategy foldingStrategy = new ParserFoldingStrategy(); -// ParseInformation parseInfo = new ParseInformation(compilationUnit); -// -// DocumentFactory docFactory = new DocumentFactory(); -// IDocument doc = docFactory.CreateDocument(); -// doc.TextContent = python; -// List markers = foldingStrategy.GenerateFoldMarkers(doc, @"C:\Temp\test.py", parseInfo); -// -// if (markers.Count > 0) { -// classMarker = markers[0]; -// } -// if (markers.Count > 1) { -// methodMarker = markers[1]; -// } + TextArea textArea = new TextArea(); + document = new TextDocument(); + textArea.Document = document; + textArea.Document.Text = python; + + ParserFoldingStrategy foldingStrategy = new ParserFoldingStrategy(textArea); + + ParseInformation parseInfo = new ParseInformation(compilationUnit); + foldingStrategy.UpdateFoldings(parseInfo); + List folds = new List(foldingStrategy.FoldingManager.AllFoldings); + + if (folds.Count > 0) { + classFold = folds[0]; + } + if (folds.Count > 1) { + methodFold = folds[1]; + } } } @@ -130,17 +137,10 @@ namespace PythonBinding.Tests.Parsing } [Test] - [Ignore] - public void MethodFoldMarkerStartColumn() - { - Assert.AreEqual(15, methodMarker.StartColumn); - } - - [Test] - [Ignore] - public void MethodFoldMarkerInnerText() + public void MethodFoldTextInsideFoldIsMethodBody() { - Assert.AreEqual("\r\n\t\tpass", methodMarker.InnerText); + string textInsideFold = document.GetText(methodFold.StartOffset, methodFold.Length); + Assert.AreEqual("\r\n\t\tpass", textInsideFold); } [Test] @@ -157,16 +157,10 @@ namespace PythonBinding.Tests.Parsing } [Test] - [Ignore] - public void ClassFoldMarkerStartColumn() - { - Assert.AreEqual(11, classMarker.StartColumn); - } - - [Test] - public void ClassFoldMarkerInnerText() + public void ClassFoldTextInsideFoldIsClassBody() { - Assert.AreEqual("\r\n\tdef foo(self):\r\n\t\tpass", classMarker.InnerText); + string textInsideFold = document.GetText(classFold.StartOffset, classFold.Length); + Assert.AreEqual("\r\n\tdef foo(self):\r\n\t\tpass", textInsideFold); } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseMethodsWithNoClassTestFixture.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseMethodsWithNoClassTestFixture.cs index 81e1bad1cb..0570becef2 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseMethodsWithNoClassTestFixture.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Parsing/ParseMethodsWithNoClassTestFixture.cs @@ -7,6 +7,11 @@ using System; using System.Collections.Generic; + +using ICSharpCode.AvalonEdit.AddIn; +using ICSharpCode.AvalonEdit.Document; +using ICSharpCode.AvalonEdit.Editing; +using ICSharpCode.AvalonEdit.Folding; using ICSharpCode.PythonBinding; using ICSharpCode.SharpDevelop.DefaultEditor.Gui.Editor; using ICSharpCode.SharpDevelop.Dom; @@ -14,19 +19,18 @@ using ICSharpCode.TextEditor.Document; using NUnit.Framework; using PythonBinding.Tests; - namespace PythonBinding.Tests.Parsing { /// /// Support folding when no classes are defined. /// [TestFixture] - [Ignore("Ignored because test depends on folding - reactivate when folding is reimplemented")] public class ParseMethodsWithNoClassTestFixture { ICompilationUnit compilationUnit; - FoldMarker fooMethodMarker = null; - FoldMarker barMethodMarker = null; + TextDocument document; + FoldingSection fooMethodFold = null; + FoldingSection barMethodFold = null; IClass globalClass; IMethod fooMethod; IMethod barMethod; @@ -52,19 +56,22 @@ namespace PythonBinding.Tests.Parsing } } -// // Get folds. -// ParserFoldingStrategy foldingStrategy = new ParserFoldingStrategy(); -// ParseInformation parseInfo = new ParseInformation(compilationUnit); -// -// DocumentFactory docFactory = new DocumentFactory(); -// IDocument doc = docFactory.CreateDocument(); -// doc.TextContent = python; -// List markers = foldingStrategy.GenerateFoldMarkers(doc, @"C:\Temp\test.py", parseInfo); -// -// if (markers.Count > 1) { -// fooMethodMarker = markers[0]; -// barMethodMarker = markers[1]; -// } + // Get folds. + TextArea textArea = new TextArea(); + document = new TextDocument(); + textArea.Document = document; + textArea.Document.Text = python; + + ParserFoldingStrategy foldingStrategy = new ParserFoldingStrategy(textArea); + + ParseInformation parseInfo = new ParseInformation(compilationUnit); + foldingStrategy.UpdateFoldings(parseInfo); + List folds = new List(foldingStrategy.FoldingManager.AllFoldings); + + if (folds.Count > 1) { + fooMethodFold = folds[0]; + barMethodFold = folds[1]; + } } [Test] @@ -170,33 +177,31 @@ namespace PythonBinding.Tests.Parsing { Assert.AreEqual(1, barMethod.Parameters.Count); } - + [Test] - [Ignore] - public void FooMethodFoldMarkerInnerText() + public void FooMethodTextInsideFoldIsFooMethodBody() { - Assert.AreEqual("\r\n\tpass", fooMethodMarker.InnerText); + string textInsideFold = document.GetText(fooMethodFold.StartOffset, fooMethodFold.Length); + Assert.AreEqual("\r\n\tpass", textInsideFold); } [Test] - [Ignore] - public void BarMethodFoldMarkerInnerText() + public void BarMethodTextInsideFoldIsBarMethodBody() { - Assert.AreEqual("\r\n\tpass", barMethodMarker.InnerText); + string textInsideFold = document.GetText(barMethodFold.StartOffset, barMethodFold.Length); + Assert.AreEqual("\r\n\tpass", textInsideFold); } [Test] - [Ignore] - public void FooMethodCollapsedFoldText() + public void FooMethodCollapsedFoldTitleIsNull() { - Assert.AreEqual("...", fooMethodMarker.FoldText); + Assert.IsNull(fooMethodFold.Title); } [Test] - [Ignore] - public void BarMethodCollapsedFoldText() + public void BarMethodCollapsedFoldTitleIsNull() { - Assert.AreEqual("...", barMethodMarker.FoldText); - } + Assert.IsNull(barMethodFold.Title); + } } } diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj index f5ff20b18e..9e4d775592 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/PythonBinding.Tests.csproj @@ -52,9 +52,6 @@ ..\..\RequiredLibraries\Microsoft.Scripting.dll - - ..\..\RequiredLibraries\Microsoft.Scripting.Core.dll - ..\..\..\..\..\Tools\NUnit\nunit.framework.dll False @@ -433,6 +430,10 @@ {8035765F-D51F-4A0C-A746-2FD100E19419} ICSharpCode.SharpDevelop.Widgets + + {0162E499-42D0-409B-AA25-EED21F75336B} + AvalonEdit.AddIn + {7D7E92DF-ACEB-4B69-92C8-8AC7A703CD57} FormsDesigner diff --git a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedPythonCodeCompletionBinding.cs b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedPythonCodeCompletionBinding.cs index 112cb0f334..0206e9258b 100644 --- a/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedPythonCodeCompletionBinding.cs +++ b/src/AddIns/BackendBindings/Python/PythonBinding/Test/Utils/DerivedPythonCodeCompletionBinding.cs @@ -23,7 +23,7 @@ namespace PythonBinding.Tests.Utils { bool ctrlSpaceCompletionDataProviderCreated; bool codeCompletionWindowDisplayed; - ICSharpCode.SharpDevelop.Editor.ITextEditor textAreaControlUsedToShowCompletionWindow; + ICSharpCode.SharpDevelop.Editor.ITextEditor textEditorUsedToShowCompletionWindow; AbstractCompletionItemProvider completionProviderUsedWhenDisplayingCodeCompletionWindow; CtrlSpaceCompletionItemProvider ctrlSpaceCompletionDataProvider; char completionCharacter = '\0'; @@ -38,9 +38,7 @@ namespace PythonBinding.Tests.Utils /// base class PythonCodeCompletionBinding. /// public bool IsCtrlSpaceCompletionDataProviderCreated { - get { - return ctrlSpaceCompletionDataProviderCreated; - } + get { return ctrlSpaceCompletionDataProviderCreated; } } /// @@ -48,21 +46,15 @@ namespace PythonBinding.Tests.Utils /// displayed the code completion window. /// public bool IsCodeCompletionWindowDisplayed { - get { - return codeCompletionWindowDisplayed; - } + get { return codeCompletionWindowDisplayed; } } - public ICSharpCode.SharpDevelop.Editor.ITextEditor TextAreaControlUsedToShowCompletionWindow { - get { - return textAreaControlUsedToShowCompletionWindow; - } + public ICSharpCode.SharpDevelop.Editor.ITextEditor TextEditorUsedToShowCompletionWindow { + get { return textEditorUsedToShowCompletionWindow; } } public AbstractCompletionItemProvider CompletionProviderUsedWhenDisplayingCodeCompletionWindow { - get { - return completionProviderUsedWhenDisplayingCodeCompletionWindow; - } + get { return completionProviderUsedWhenDisplayingCodeCompletionWindow; } } /// @@ -70,9 +62,7 @@ namespace PythonBinding.Tests.Utils /// CreateCtrlSpaceCompletionDataProvider method. /// public CtrlSpaceCompletionItemProvider CtrlSpaceCompletionDataProvider { - get { - return ctrlSpaceCompletionDataProvider; - } + get { return ctrlSpaceCompletionDataProvider; } } /// @@ -80,9 +70,7 @@ namespace PythonBinding.Tests.Utils /// ShowCompletionWindow method. /// public char CompletionCharacter { - get { - return completionCharacter; - } + get { return completionCharacter; } } /// @@ -90,9 +78,7 @@ namespace PythonBinding.Tests.Utils /// CtrlSpaceCompletionDataProvider is created. /// public ExpressionContext ExpressionContext { - get { - return expressionContext; - } + get { return expressionContext; } } /// @@ -114,7 +100,7 @@ namespace PythonBinding.Tests.Utils /// protected override void ShowCodeCompletionWindow(ICSharpCode.SharpDevelop.Editor.ITextEditor textEditor, AbstractCompletionItemProvider completionDataProvider, char ch) { - textAreaControlUsedToShowCompletionWindow = textEditor; + textEditorUsedToShowCompletionWindow = textEditor; codeCompletionWindowDisplayed = true; completionCharacter = ch; completionProviderUsedWhenDisplayingCodeCompletionWindow = completionDataProvider; diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.Modules.dll b/src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.Modules.dll index 7419c3e5b0..6b00bd48ff 100755 Binary files a/src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.Modules.dll and b/src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.Modules.dll differ diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.dll b/src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.dll index afc1683995..74510705f4 100755 Binary files a/src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.dll and b/src/AddIns/BackendBindings/Python/RequiredLibraries/IronPython.dll differ diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Dynamic.dll b/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Dynamic.dll index 61bb54c72b..42b137aee8 100644 Binary files a/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Dynamic.dll and b/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Dynamic.dll differ diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.Core.dll b/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.Core.dll deleted file mode 100755 index 29a06e8276..0000000000 Binary files a/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.Core.dll and /dev/null differ diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.Debugging.dll b/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.Debugging.dll index fedb462d3d..0b79ae3c33 100644 Binary files a/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.Debugging.dll and b/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.Debugging.dll differ diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.ExtensionAttribute.dll b/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.ExtensionAttribute.dll deleted file mode 100644 index 60de3d287f..0000000000 Binary files a/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.ExtensionAttribute.dll and /dev/null differ diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.dll b/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.dll index 12a24c9ccb..298bc5d95b 100755 Binary files a/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.dll and b/src/AddIns/BackendBindings/Python/RequiredLibraries/Microsoft.Scripting.dll differ diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/ipy.exe b/src/AddIns/BackendBindings/Python/RequiredLibraries/ipy.exe index 87c0cb9215..73ab2c61e4 100755 Binary files a/src/AddIns/BackendBindings/Python/RequiredLibraries/ipy.exe and b/src/AddIns/BackendBindings/Python/RequiredLibraries/ipy.exe differ diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/ipy64.exe b/src/AddIns/BackendBindings/Python/RequiredLibraries/ipy64.exe deleted file mode 100644 index 0576fc76dd..0000000000 Binary files a/src/AddIns/BackendBindings/Python/RequiredLibraries/ipy64.exe and /dev/null differ diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/ipyw.exe b/src/AddIns/BackendBindings/Python/RequiredLibraries/ipyw.exe index 50f43b4b5b..86b8dd93c8 100644 Binary files a/src/AddIns/BackendBindings/Python/RequiredLibraries/ipyw.exe and b/src/AddIns/BackendBindings/Python/RequiredLibraries/ipyw.exe differ diff --git a/src/AddIns/BackendBindings/Python/RequiredLibraries/ipyw64.exe b/src/AddIns/BackendBindings/Python/RequiredLibraries/ipyw64.exe deleted file mode 100644 index e20a5e75c3..0000000000 Binary files a/src/AddIns/BackendBindings/Python/RequiredLibraries/ipyw64.exe and /dev/null differ