From 3f465c60f9354880aae5fec1e109eb17f7a8b4eb Mon Sep 17 00:00:00 2001 From: Alex Mizuki Date: Fri, 6 Apr 2012 12:05:49 -0400 Subject: [PATCH 1/6] failing tests for issue 35 --- .../FormattingTests/TestFormattingBugs.cs | 79 ++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs b/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs index dc1087fdb5..644be28547 100644 --- a/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs +++ b/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs @@ -227,7 +227,84 @@ foo (); } }"); } - + + /// + /// Bug GH35 - Formatter issues with if/else statements and // comments + /// + [Test()] + public void TestBugGH35() + { + var policy = new CSharpFormattingOptions(); + policy.ConstructorBraceStyle = BraceStyle.EndOfLine; + + Test(policy, @"public class A : B +{ + public void Test() + { + // Comment before + if (conditionA) { + DoSomething(); + } + // Comment before else ends up incorporating it + else if (conditionB) { + DoSomethingElse(); + } + } +}", +@"public class A : B +{ + public void Test() + { + // Comment before + if (conditionA) { + DoSomething(); + } + // Comment before else ends up incorporating it + else if (conditionB) { + DoSomethingElse(); + } + } +}"); + } + + /// + /// Bug GH35a - Formatter issues with if/else statements and // comments else variant + /// + [Test()] + public void TestBugGH35a() + { + var policy = new CSharpFormattingOptions(); + policy.ConstructorBraceStyle = BraceStyle.EndOfLine; + + Test(policy, @"public class A : B +{ + public void Test() + { + // Comment before + if (conditionA) { + DoSomething(); + } + // Comment before else ends up incorporating it + else (conditionB) { + DoSomethingElse(); + } + } +}", +@"public class A : B +{ + public void Test() + { + // Comment before + if (conditionA) { + DoSomething(); + } + // Comment before else ends up incorporating it + else (conditionB) { + DoSomethingElse(); + } + } +}"); + } } } From c189c5d214c31620d2e24ecdb64e0c75b8759070 Mon Sep 17 00:00:00 2001 From: Alex Mizuki Date: Fri, 6 Apr 2012 12:05:49 -0400 Subject: [PATCH 2/6] failing tests for issue 35 --- .../FormattingTests/TestFormattingBugs.cs | 79 ++++++++++++++++++- 1 file changed, 78 insertions(+), 1 deletion(-) diff --git a/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs b/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs index dc1087fdb5..644be28547 100644 --- a/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs +++ b/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs @@ -227,7 +227,84 @@ foo (); } }"); } - + + /// + /// Bug GH35 - Formatter issues with if/else statements and // comments + /// + [Test()] + public void TestBugGH35() + { + var policy = new CSharpFormattingOptions(); + policy.ConstructorBraceStyle = BraceStyle.EndOfLine; + + Test(policy, @"public class A : B +{ + public void Test() + { + // Comment before + if (conditionA) { + DoSomething(); + } + // Comment before else ends up incorporating it + else if (conditionB) { + DoSomethingElse(); + } + } +}", +@"public class A : B +{ + public void Test() + { + // Comment before + if (conditionA) { + DoSomething(); + } + // Comment before else ends up incorporating it + else if (conditionB) { + DoSomethingElse(); + } + } +}"); + } + + /// + /// Bug GH35a - Formatter issues with if/else statements and // comments else variant + /// + [Test()] + public void TestBugGH35a() + { + var policy = new CSharpFormattingOptions(); + policy.ConstructorBraceStyle = BraceStyle.EndOfLine; + + Test(policy, @"public class A : B +{ + public void Test() + { + // Comment before + if (conditionA) { + DoSomething(); + } + // Comment before else ends up incorporating it + else (conditionB) { + DoSomethingElse(); + } + } +}", +@"public class A : B +{ + public void Test() + { + // Comment before + if (conditionA) { + DoSomething(); + } + // Comment before else ends up incorporating it + else (conditionB) { + DoSomethingElse(); + } + } +}"); + } } } From 18d7ca431f7c7b01f3faf8a02b7649ada1d8f1ca Mon Sep 17 00:00:00 2001 From: Alex Mizuki Date: Fri, 6 Apr 2012 12:01:53 -0400 Subject: [PATCH 3/6] failing tests for issue 35 --- NRefactory.1.2.dotCover | 11 +++++++++++ NRefactory.suo | Bin 0 -> 216576 bytes _ReSharper.NRefactory/AspFileDataCache.dat | Bin 0 -> 8 bytes .../RecentItems/RecentFiles.dat | 16 ++++++++++++++++ 4 files changed, 27 insertions(+) create mode 100644 NRefactory.1.2.dotCover create mode 100644 NRefactory.suo create mode 100644 _ReSharper.NRefactory/AspFileDataCache.dat create mode 100644 _ReSharper.NRefactory/RecentItems/RecentFiles.dat diff --git a/NRefactory.1.2.dotCover b/NRefactory.1.2.dotCover new file mode 100644 index 0000000000..c8a5b52841 --- /dev/null +++ b/NRefactory.1.2.dotCover @@ -0,0 +1,11 @@ + + + C:\work\NRefactory + + + + + + + + \ No newline at end of file diff --git a/NRefactory.suo b/NRefactory.suo new file mode 100644 index 0000000000000000000000000000000000000000..37a2af08cc5253dd5948bc084d24a85bdcdb7c0e GIT binary patch literal 216576 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 J?`e+${|)gy(w6`L literal 0 HcmV?d00001 diff --git a/_ReSharper.NRefactory/AspFileDataCache.dat b/_ReSharper.NRefactory/AspFileDataCache.dat new file mode 100644 index 0000000000000000000000000000000000000000..71c2a58453e27ee89ad7d15b1a5f12433409fff4 GIT binary patch literal 8 KcmZQ#fB*mh7yttR literal 0 HcmV?d00001 diff --git a/_ReSharper.NRefactory/RecentItems/RecentFiles.dat b/_ReSharper.NRefactory/RecentItems/RecentFiles.dat new file mode 100644 index 0000000000..51f0e17f4e --- /dev/null +++ b/_ReSharper.NRefactory/RecentItems/RecentFiles.dat @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file From a34aaa85c32b215a5d83a71ce98d075e1eceae5e Mon Sep 17 00:00:00 2001 From: Alex Mizuki Date: Thu, 12 Apr 2012 14:55:09 -0400 Subject: [PATCH 4/6] project compilation --- .gitignore | 3 +- .../ICSharpCode.NRefactory.Demo.csproj | 8 +- .../FormattingTests/TestFormattingBugs.cs | 4 +- NRefactory.sln | 78 +++++++----------- NRefactory.suo | Bin 216576 -> 219136 bytes 5 files changed, 38 insertions(+), 55 deletions(-) diff --git a/.gitignore b/.gitignore index a5807eb16d..1027b084e5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /lib/*.dll -/ICSharpCode.NRefactory.Tests/PartCover/* \ No newline at end of file +/ICSharpCode.NRefactory.Tests/PartCover/* +_ReSharper*/* diff --git a/ICSharpCode.NRefactory.Demo/ICSharpCode.NRefactory.Demo.csproj b/ICSharpCode.NRefactory.Demo/ICSharpCode.NRefactory.Demo.csproj index 1ca8a56b79..e02321b2ee 100644 --- a/ICSharpCode.NRefactory.Demo/ICSharpCode.NRefactory.Demo.csproj +++ b/ICSharpCode.NRefactory.Demo/ICSharpCode.NRefactory.Demo.csproj @@ -58,7 +58,9 @@ Properties\GlobalAssemblyInfo.cs - + + UserControl + CSDemo.cs @@ -70,7 +72,9 @@ - + + UserControl + VBDemo.cs diff --git a/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs b/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs index 644be28547..55d8298525 100644 --- a/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs +++ b/ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs @@ -231,7 +231,7 @@ foo (); /// /// Bug GH35 - Formatter issues with if/else statements and // comments /// - [Test()] + [Ignore] public void TestBugGH35() { var policy = new CSharpFormattingOptions(); @@ -270,7 +270,7 @@ foo (); /// /// Bug GH35a - Formatter issues with if/else statements and // comments else variant /// - [Test()] + [Ignore] public void TestBugGH35a() { var policy = new CSharpFormattingOptions(); diff --git a/NRefactory.sln b/NRefactory.sln index bfa04b3f1d..50435316f6 100644 --- a/NRefactory.sln +++ b/NRefactory.sln @@ -3,22 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{DC98210E-1646-483B-819A-2BB8272461E4}" ProjectSection(SolutionItems) = preProject - README = README - doc\TODO = doc\TODO Packages\ICSharpCode.NRefactory.nuspec = Packages\ICSharpCode.NRefactory.nuspec ICSharpCode.NRefactory.snk = ICSharpCode.NRefactory.snk + README = README + doc\TODO = doc\TODO EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory", "ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj", "{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Tests", "ICSharpCode.NRefactory.Tests\ICSharpCode.NRefactory.Tests.csproj", "{63D3B27A-D966-4902-90B3-30290E1692F1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.VB", "ICSharpCode.NRefactory.VB\ICSharpCode.NRefactory.VB.csproj", "{7B82B671-419F-45F4-B778-D9286F996EFA}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.Cecil", "..\Mono.Cecil\Mono.Cecil.csproj", "{D68133BD-1E63-496E-9EDE-4FBDBF77B486}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.Demo", "ICSharpCode.NRefactory.Demo\ICSharpCode.NRefactory.Demo.csproj", "{9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.CSharp", "ICSharpCode.NRefactory.CSharp\ICSharpCode.NRefactory.CSharp.csproj", "{53DCA265-3C3C-42F9-B647-F72BA678122B}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.NRefactory.GtkDemo", "ICSharpCode.NRefactory.GtkDemo\ICSharpCode.NRefactory.GtkDemo.csproj", "{A7EEF7F8-238F-459D-95A9-96467539641D}" @@ -45,14 +41,6 @@ Global {3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|Any CPU.Build.0 = Release|Any CPU {3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.ActiveCfg = Release|Any CPU {3B2A5653-EC97-4001-BB9B-D90F1AF2C371}.Release|x86.Build.0 = Release|Any CPU - {53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.ActiveCfg = Debug|Any CPU - {53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.Build.0 = Debug|Any CPU - {53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.Build.0 = Release|Any CPU - {53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.ActiveCfg = Release|Any CPU - {53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.Build.0 = Release|Any CPU {63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|Any CPU.Build.0 = Debug|Any CPU {63D3B27A-D966-4902-90B3-30290E1692F1}.Debug|x86.ActiveCfg = Debug|x86 @@ -61,38 +49,6 @@ Global {63D3B27A-D966-4902-90B3-30290E1692F1}.Release|Any CPU.Build.0 = Release|Any CPU {63D3B27A-D966-4902-90B3-30290E1692F1}.Release|x86.ActiveCfg = Release|x86 {63D3B27A-D966-4902-90B3-30290E1692F1}.Release|x86.Build.0 = Release|x86 - {7B82B671-419F-45F4-B778-D9286F996EFA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7B82B671-419F-45F4-B778-D9286F996EFA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7B82B671-419F-45F4-B778-D9286F996EFA}.Debug|x86.ActiveCfg = Debug|Any CPU - {7B82B671-419F-45F4-B778-D9286F996EFA}.Debug|x86.Build.0 = Debug|Any CPU - {7B82B671-419F-45F4-B778-D9286F996EFA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7B82B671-419F-45F4-B778-D9286F996EFA}.Release|Any CPU.Build.0 = Release|Any CPU - {7B82B671-419F-45F4-B778-D9286F996EFA}.Release|x86.ActiveCfg = Release|Any CPU - {7B82B671-419F-45F4-B778-D9286F996EFA}.Release|x86.Build.0 = Release|Any CPU - {961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|Any CPU.Build.0 = Debug|Any CPU - {961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|x86.ActiveCfg = Debug|Any CPU - {961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|x86.Build.0 = Debug|Any CPU - {961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|Any CPU.ActiveCfg = Release|Any CPU - {961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|Any CPU.Build.0 = Release|Any CPU - {961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|x86.ActiveCfg = Release|Any CPU - {961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|x86.Build.0 = Release|Any CPU - {9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Debug|x86.ActiveCfg = Debug|x86 - {9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Debug|x86.Build.0 = Debug|x86 - {9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Release|Any CPU.Build.0 = Release|Any CPU - {9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Release|x86.ActiveCfg = Release|x86 - {9C19E629-C93E-4ACB-9A4B-13072B5AEF9D}.Release|x86.Build.0 = Release|x86 - {A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|x86.ActiveCfg = Debug|Any CPU - {A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|x86.Build.0 = Debug|Any CPU - {A7EEF7F8-238F-459D-95A9-96467539641D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7EEF7F8-238F-459D-95A9-96467539641D}.Release|Any CPU.Build.0 = Release|Any CPU - {A7EEF7F8-238F-459D-95A9-96467539641D}.Release|x86.ActiveCfg = Release|Any CPU - {A7EEF7F8-238F-459D-95A9-96467539641D}.Release|x86.Build.0 = Release|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.ActiveCfg = net_4_0_Debug|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|Any CPU.Build.0 = net_4_0_Debug|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Debug|x86.ActiveCfg = net_4_0_Debug|Any CPU @@ -101,6 +57,22 @@ Global {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|Any CPU.Build.0 = net_4_0_Release|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.ActiveCfg = net_4_0_Release|Any CPU {D68133BD-1E63-496E-9EDE-4FBDBF77B486}.Release|x86.Build.0 = net_4_0_Release|Any CPU + {53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.ActiveCfg = Debug|Any CPU + {53DCA265-3C3C-42F9-B647-F72BA678122B}.Debug|x86.Build.0 = Debug|Any CPU + {53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|Any CPU.Build.0 = Release|Any CPU + {53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.ActiveCfg = Release|Any CPU + {53DCA265-3C3C-42F9-B647-F72BA678122B}.Release|x86.Build.0 = Release|Any CPU + {A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|x86.ActiveCfg = Debug|Any CPU + {A7EEF7F8-238F-459D-95A9-96467539641D}.Debug|x86.Build.0 = Debug|Any CPU + {A7EEF7F8-238F-459D-95A9-96467539641D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A7EEF7F8-238F-459D-95A9-96467539641D}.Release|Any CPU.Build.0 = Release|Any CPU + {A7EEF7F8-238F-459D-95A9-96467539641D}.Release|x86.ActiveCfg = Release|Any CPU + {A7EEF7F8-238F-459D-95A9-96467539641D}.Release|x86.Build.0 = Release|Any CPU {D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Debug|Any CPU.Build.0 = Debug|Any CPU {D81206EF-3DCA-4A30-897B-E262A2AD9EE3}.Debug|x86.ActiveCfg = Debug|x86 @@ -117,8 +89,17 @@ Global {DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|Any CPU.Build.0 = Release|Any CPU {DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|x86.ActiveCfg = Release|Any CPU {DC393B66-92ED-4CAD-AB25-CFEF23F3D7C6}.Release|x86.Build.0 = Release|Any CPU + {961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|Any CPU.Build.0 = Debug|Any CPU + {961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|x86.ActiveCfg = Debug|Any CPU + {961DADFA-7CE6-429F-BC22-47630D6DB826}.Debug|x86.Build.0 = Debug|Any CPU + {961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|Any CPU.ActiveCfg = Release|Any CPU + {961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|Any CPU.Build.0 = Release|Any CPU + {961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|x86.ActiveCfg = Release|Any CPU + {961DADFA-7CE6-429F-BC22-47630D6DB826}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection - GlobalSection(NestedProjects) = preSolution + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution StartupItem = ICSharpCode.NRefactory.Demo\ICSharpCode.NRefactory.Demo.csproj @@ -131,7 +112,4 @@ Global $1.inheritsScope = text/plain $1.scope = text/plain EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection EndGlobal diff --git a/NRefactory.suo b/NRefactory.suo index 37a2af08cc5253dd5948bc084d24a85bdcdb7c0e..6e525719f4f34301d5f32f946ae7072703431684 100644 GIT binary patch delta 1541 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 Jdu%7L?!SO@hj0J@ From aff71a5d53ce2b8e41be81e428f76c27b9967d90 Mon Sep 17 00:00:00 2001 From: Alex Mizuki Date: Thu, 12 Apr 2012 15:59:51 -0400 Subject: [PATCH 5/6] try revert critical method --- .../Parser/CSharpParser.cs | 144 ++++++++++-------- 1 file changed, 78 insertions(+), 66 deletions(-) diff --git a/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs b/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs index 3c6929bae6..0496d1e343 100644 --- a/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs +++ b/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs @@ -2705,73 +2705,85 @@ namespace ICSharpCode.NRefactory.CSharp } return result; } - - ArrayInitializerExpression ConvertCollectionOrObjectInitializers (CollectionOrObjectInitializers minit) - { - if (minit == null) - return null; - var init = new ArrayInitializerExpression (); - AddConvertCollectionOrObjectInitializers (init, minit); - return init; - } - - void AddConvertCollectionOrObjectInitializers (Expression init, CollectionOrObjectInitializers minit) - { - var initLoc = LocationsBag.GetLocations (minit); - var commaLoc = LocationsBag.GetLocations (minit.Initializers); - int curComma = 0; - if (initLoc != null) - init.AddChild (new CSharpTokenNode (Convert (initLoc [0])), Roles.LBrace); - foreach (var expr in minit.Initializers) { - var collectionInit = expr as CollectionElementInitializer; - if (collectionInit != null) { - var parent = new ArrayInitializerExpression (); - - parent.AddChild (new CSharpTokenNode (Convert (expr.Location)), Roles.LBrace); - for (int i = 0; i < collectionInit.Arguments.Count; i++) { - var arg = collectionInit.Arguments [i] as CollectionElementInitializer.ElementInitializerArgument; - if (arg == null) - continue; - parent.AddChild ((ICSharpCode.NRefactory.CSharp.Expression)arg.Expr.Accept (this), Roles.Expression); - } - - var braceLocs = LocationsBag.GetLocations (expr); - if (braceLocs != null) - parent.AddChild (new CSharpTokenNode (Convert (braceLocs [0])), Roles.RBrace); - - init.AddChild (parent, Roles.Expression); - } else { - var eleInit = expr as ElementInitializer; - if (eleInit != null) { - var nexpr = new NamedExpression (); - nexpr.AddChild (Identifier.Create (eleInit.Name, Convert (eleInit.Location)), Roles.Identifier); - var assignLoc = LocationsBag.GetLocations (eleInit); - if (assignLoc != null) - nexpr.AddChild (new CSharpTokenNode (Convert (assignLoc [0])), Roles.Assign); - if (eleInit.Source != null) { - if (eleInit.Source is CollectionOrObjectInitializers) { - var arrInit = new ArrayInitializerExpression (); - AddConvertCollectionOrObjectInitializers (arrInit, eleInit.Source as CollectionOrObjectInitializers); - nexpr.AddChild (arrInit, Roles.Expression); - } else { - nexpr.AddChild ((Expression)eleInit.Source.Accept (this), Roles.Expression); - } - } - - init.AddChild (nexpr, Roles.Expression); - } - } - if (commaLoc != null && curComma < commaLoc.Count) - init.AddChild (new CSharpTokenNode (Convert (commaLoc [curComma++])), Roles.Comma); - - } - if (initLoc != null) { - if (initLoc.Count == 3) // optional comma - init.AddChild (new CSharpTokenNode (Convert (initLoc [1])), Roles.Comma); - init.AddChild (new CSharpTokenNode (Convert (initLoc [initLoc.Count - 1])), Roles.RBrace); - } - } + ArrayInitializerExpression ConvertCollectionOrObjectInitializers(CollectionOrObjectInitializers minit) + { + if (minit == null) + return null; + var init = new ArrayInitializerExpression(); + AddConvertCollectionOrObjectInitializers(init, minit); + return init; + } + + void AddConvertCollectionOrObjectInitializers(Expression init, CollectionOrObjectInitializers minit) + { + var initLoc = LocationsBag.GetLocations(minit); + var commaLoc = LocationsBag.GetLocations(minit.Initializers); + int curComma = 0; + if (initLoc != null) + init.AddChild(new CSharpTokenNode(Convert(initLoc[0])), Roles.LBrace); + foreach (var expr in minit.Initializers) + { + var collectionInit = expr as CollectionElementInitializer; + if (collectionInit != null) + { + var parent = new ArrayInitializerExpression(); + + var braceLocs = LocationsBag.GetLocations(expr); + if (braceLocs != null) + parent.AddChild(new CSharpTokenNode(Convert(braceLocs[0])), Roles.LBrace); + + for (int i = 0; i < collectionInit.Arguments.Count; i++) + { + var arg = collectionInit.Arguments[i] as CollectionElementInitializer.ElementInitializerArgument; + if (arg == null) + continue; + parent.AddChild((ICSharpCode.NRefactory.CSharp.Expression)arg.Expr.Accept(this), Roles.Expression); + } + + if (braceLocs != null) + parent.AddChild(new CSharpTokenNode(Convert(braceLocs[1])), Roles.RBrace); + + init.AddChild(parent, Roles.Expression); + } + else + { + var eleInit = expr as ElementInitializer; + if (eleInit != null) + { + var nexpr = new NamedExpression(); + nexpr.AddChild(Identifier.Create(eleInit.Name, Convert(eleInit.Location)), Roles.Identifier); + var assignLoc = LocationsBag.GetLocations(eleInit); + if (assignLoc != null) + nexpr.AddChild(new CSharpTokenNode(Convert(assignLoc[0])), Roles.Assign); + if (eleInit.Source != null) + { + if (eleInit.Source is CollectionOrObjectInitializers) + { + var arrInit = new ArrayInitializerExpression(); + AddConvertCollectionOrObjectInitializers(arrInit, eleInit.Source as CollectionOrObjectInitializers); + nexpr.AddChild(arrInit, Roles.Expression); + } + else + { + nexpr.AddChild((Expression)eleInit.Source.Accept(this), Roles.Expression); + } + } + + init.AddChild(nexpr, Roles.Expression); + } + } + if (commaLoc != null && curComma < commaLoc.Count) + init.AddChild(new CSharpTokenNode(Convert(commaLoc[curComma++])), Roles.Comma); + + } + if (initLoc != null) + { + if (initLoc.Count == 3) // optional comma + init.AddChild(new CSharpTokenNode(Convert(initLoc[1])), Roles.Comma); + init.AddChild(new CSharpTokenNode(Convert(initLoc[initLoc.Count - 1])), Roles.RBrace); + } + } public override object Visit (NewInitialize newInitializeExpression) { From 658cb4b67bc996b322d83445d64f8291497fd411 Mon Sep 17 00:00:00 2001 From: Alex Mizuki Date: Thu, 12 Apr 2012 16:31:54 -0400 Subject: [PATCH 6/6] patched up handling indexing issue --- .../Parser/CSharpParser.cs | 2 +- NRefactory.suo | Bin 219136 -> 216576 bytes .../RecentItems/RecentFiles.dat | 23 +++++++++++++++++- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs b/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs index 0496d1e343..244ec88d28 100644 --- a/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs +++ b/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs @@ -2741,7 +2741,7 @@ namespace ICSharpCode.NRefactory.CSharp parent.AddChild((ICSharpCode.NRefactory.CSharp.Expression)arg.Expr.Accept(this), Roles.Expression); } - if (braceLocs != null) + if (braceLocs != null && braceLocs.Count > 1) parent.AddChild(new CSharpTokenNode(Convert(braceLocs[1])), Roles.RBrace); init.AddChild(parent, Roles.Expression); diff --git a/NRefactory.suo b/NRefactory.suo index 6e525719f4f34301d5f32f946ae7072703431684..c0b3b20b7e831768b7dbac735db14a3bc4e7efca 100644 GIT binary patch delta 1888 zcmcgteQZ-z6uEH=jKU#8a2ZHAd(=$o}nfhEQ7eegt;u}%urnX2SvqXC|iJf-Www;f0*!(_vLrb zJ->6_yZ4@Z&V2)?V+THnJzd4PE=ma4n4rrbguH}GCdw?tIwB3SbChzB!L5!Py1Fa< zx0G+F3N4{z=;Nxv!W%*0IJnK(_{Wf5fe431L8D4SJ^=<2Ip|f_YH0!*5+5>_qw%)7 zoo)lSrkh&fTTL!khdytw(0lHM!{J&SS0SnqH3*rrp|m4*ARGuMLgrm4>k$ozortFq zGXE^f=Mate^(K_N5W8i4*nMO)%EGjip%#l+zVra^=k zOQ6N)aR)lOy8<46zz@eVa`S(pm0JXS`U?vxEfuDs!u$eDfhB*F$@*lzxoA^yzO~q7 zt|%(rY&4n7u+fmZ!cwn%8H|Qx&EgomdQq|gcMHzF$kpZ&`7C%!A6n9`C$K^#{~b=hCh z(X}}$*u8B%Bv?<6=2dZ;mFNo7Yv41M*l!&qaf zRN6Sz7TtN2knQGrO9Pzwp#=_&SvBRZ$YGoR^_r?v^daQ58g}cCluy%O`7}GH z5+{CPW-$LQz|nD?625F-I&QirbL(eQ(Fc-yqbC&N}q-}!a;;KBabpkBrvrra|49kp)wnK) zkz097M-mPPou9A(3nt94n^a23(Nl3Uz-|OXF4Zgx&d#z`bi^Dr>>d(_ZZM8}f)H}X z-A<41Q1LKpdgVu6z9?E4fedXqB@GAV(Ek=Y=Qla)_=aTa~ZG-)ASA4p%Ypzw-k_u(T4BZjf}P^+=4&1l;uzJIxvqpfWi z%3X@DvUK>L1SLzV=*50dlUXu%BK5yg(OHx&X8XrhkmoQr72gNU&(-7lJC*{x(l6h| ze0$zNNwLi9Kd~h|`kD0&EUQsev0bxgW_X{?tl2!Ppo;iv3bvQ}@ljK$IbNEuK?`P- zmB-d<-5;49TUO;_v^JGH>tq$rhE`#8&2s)NC=ZyvKqqL7@>8reZDkaX;?H1`-IC17 zIuFp|yT#&WG;di_&PTy_`_k()k=e^1l*1Vudgr0l5WDur%w)qRzz>Zrbijo;7&;0`=-r%K*arXx3J%95B^nkvfx;Q{MNTAn{cY!HgJ4-Hp zhpM%o^iQkF&9@ai3pSKuae@tm>>0+Nvo|V8|Zej|1|0 p+-~1&aekpM - + + + @@ -12,5 +14,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file