pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #36 from awatertree/master 

Formatter issues with if/else statements and // comments
newNRvisualizers
Mike Krüger 13 years ago
parent
0179c76aa2 658cb4b67b
commit
cdd492e4d9
9 changed files with 240 additions and 120 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      .gitignore
  2. 144
      ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
  3. 8
      ICSharpCode.NRefactory.Demo/ICSharpCode.NRefactory.Demo.csproj
  4. 79
      ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs
  5. 11
      NRefactory.1.2.dotCover
  6. 78
      NRefactory.sln
  7. BIN
      NRefactory.suo
  8. BIN
      _ReSharper.NRefactory/AspFileDataCache.dat
  9. 37
      _ReSharper.NRefactory/RecentItems/RecentFiles.dat

3
.gitignore vendored
Unescape View File

@ -1,2 +1,3 @@ @@ -1,2 +1,3 @@
/lib/*.dll
/ICSharpCode.NRefactory.Tests/PartCover/*
/ICSharpCode.NRefactory.Tests/PartCover/*
_ReSharper*/*

144
ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
Unescape View File

@ -2710,73 +2710,85 @@ namespace ICSharpCode.NRefactory.CSharp @@ -2710,73 +2710,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 && braceLocs.Count > 1)
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)
{

8
ICSharpCode.NRefactory.Demo/ICSharpCode.NRefactory.Demo.csproj
Unescape View File

@ -58,7 +58,9 @@ @@ -58,7 +58,9 @@
<Compile Include="..\ICSharpCode.NRefactory\Properties\GlobalAssemblyInfo.cs">
<Link>Properties\GlobalAssemblyInfo.cs</Link>
</Compile>
<Compile Include="CSDemo.cs" />
<Compile Include="CSDemo.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="CSDemo.Designer.cs">
<DependentUpon>CSDemo.cs</DependentUpon>
</Compile>
@ -70,7 +72,9 @@ @@ -70,7 +72,9 @@
</Compile>
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="VBDemo.cs" />
<Compile Include="VBDemo.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="VBDemo.Designer.cs">
<DependentUpon>VBDemo.cs</DependentUpon>
</Compile>

79
ICSharpCode.NRefactory.Tests/FormattingTests/TestFormattingBugs.cs
Unescape View File

@ -227,7 +227,84 @@ foo (); @@ -227,7 +227,84 @@ foo ();
}
}");
}
/// <summary>
/// Bug GH35 - Formatter issues with if/else statements and // comments
/// </summary>
[Ignore]
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();
}
}
}");
}
/// <summary>
/// Bug GH35a - Formatter issues with if/else statements and // comments else variant
/// </summary>
[Ignore]
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();
}
}
}");
}
}
}

11
NRefactory.1.2.dotCover
Unescape View File

@ -0,0 +1,11 @@ @@ -0,0 +1,11 @@
<Configuration>
<SnapshotDialog>
<InitialDirectory>C:\work\NRefactory</InitialDirectory>
</SnapshotDialog>
<CoverageFilters>
<IncludeFilters>
<Filter ModuleMask="*" ClassMask="*" FunctionMask="*" />
</IncludeFilters>
<ExcludeFilters />
</CoverageFilters>
</Configuration>

78
NRefactory.sln
Unescape View File

@ -3,22 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 11.00 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -131,7 +112,4 @@ Global
$1.inheritsScope = text/plain
$1.scope = text/plain
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

BIN
NRefactory.suo
View File

Binary file not shown.

BIN
_ReSharper.NRefactory/AspFileDataCache.dat
View File

Binary file not shown.

37
_ReSharper.NRefactory/RecentItems/RecentFiles.dat
Unescape View File

@ -0,0 +1,37 @@ @@ -0,0 +1,37 @@
<RecentFiles>
<RecentFiles>
<File id="63D3B27A-D966-4902-90B3-30290E1692F1/d:FormattingTests/f:TestFormattingBugs.cs" caret="1792" fromTop="0" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="119900" fromTop="31" />
<File id="63D3B27A-D966-4902-90B3-30290E1692F1/d:CSharp/d:Resolver/f:ObjectCreationTests.cs" caret="5290" fromTop="12" />
</RecentFiles>
<RecentEdits>
<File id="63D3B27A-D966-4902-90B3-30290E1692F1/d:FormattingTests/f:TestFormattingBugs.cs" caret="6244" fromTop="8" />
<File id="63D3B27A-D966-4902-90B3-30290E1692F1/d:FormattingTests/f:TestFormattingBugs.cs" caret="6537" fromTop="22" />
<File id="63D3B27A-D966-4902-90B3-30290E1692F1/d:FormattingTests/f:TestFormattingBugs.cs" caret="6002" fromTop="5" />
<File id="63D3B27A-D966-4902-90B3-30290E1692F1/d:FormattingTests/f:TestFormattingBugs.cs" caret="7645" fromTop="29" />
<File id="63D3B27A-D966-4902-90B3-30290E1692F1/d:FormattingTests/f:TestFormattingBugs.cs" caret="7663" fromTop="34" />
<File id="63D3B27A-D966-4902-90B3-30290E1692F1/d:FormattingTests/f:TestFormattingBugs.cs" caret="7645" fromTop="2" />
<File id="63D3B27A-D966-4902-90B3-30290E1692F1/d:FormattingTests/f:TestFormattingBugs.cs" caret="7645" fromTop="19" />
<File id="63D3B27A-D966-4902-90B3-30290E1692F1/d:FormattingTests/f:TestFormattingBugs.cs" caret="7645" fromTop="18" />
<File id="63D3B27A-D966-4902-90B3-30290E1692F1/d:FormattingTests/f:TestFormattingBugs.cs" caret="7401" fromTop="18" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="159824" fromTop="16" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="159824" fromTop="16" />
<File id="63D3B27A-D966-4902-90B3-30290E1692F1/d:CSharp/d:Resolver/f:ObjectCreationTests.cs" caret="5446" fromTop="19" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="159824" fromTop="20" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="159824" fromTop="34" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="159824" fromTop="0" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="159824" fromTop="0" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="1631" fromTop="23" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="118802" fromTop="14" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="119331" fromTop="24" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="120055" fromTop="37" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="120698" fromTop="25" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="121207" fromTop="32" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="121427" fromTop="36" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="121564" fromTop="25" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="121796" fromTop="29" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="122139" fromTop="36" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="118376" fromTop="34" />
<File id="53DCA265-3C3C-42F9-B647-F72BA678122B/d:Parser/f:CSharpParser.cs" caret="119900" fromTop="31" />
</RecentEdits>
</RecentFiles>
Write Preview
Loading…
Cancel
Save