@ -6,6 +6,7 @@
@@ -6,6 +6,7 @@
// </file>
using System ;
using System.Collections.Generic ;
using ICSharpCode.Core ;
using ICSharpCode.SharpDevelop.Dom ;
using ICSharpCode.SharpDevelop.Dom.Refactoring ;
@ -22,7 +23,6 @@ namespace ICSharpCode.SharpDevelop
@@ -22,7 +23,6 @@ namespace ICSharpCode.SharpDevelop
static AmbienceService ( )
{
PropertyService . PropertyChanged + = new PropertyChangedEventHandler ( PropertyChanged ) ;
ApplyCodeGenerationPropertiesToNRefactory ( ) ;
}
public static Properties CodeGenerationProperties {
@ -31,21 +31,22 @@ namespace ICSharpCode.SharpDevelop
@@ -31,21 +31,22 @@ namespace ICSharpCode.SharpDevelop
}
}
static void ApplyCodeGenerationPropertiesToNRefactory ( )
static List < CodeGenerator > codeGenerators = new List < CodeGenerator > ( ) ;
static void ApplyCodeGenerationProperties ( CodeGenerator generator )
{
CodeGeneratorOptions csharpOptions = LanguageProperties . CSharp . CodeGenerator . Options ;
CodeGeneratorOptions vbOptions = LanguageProperties . VBNet . CodeGenerator . Options ;
CodeGeneratorOptions options = generator . Options ;
System . CodeDom . Compiler . CodeGeneratorOptions cdo = new CodeDOMGeneratorUtility ( ) . CreateCodeGeneratorOptions ;
csharpO ptions. EmptyLinesBetweenMembers = cdo . BlankLinesBetweenMembers ;
vbOptions . EmptyLinesBetweenMembers = cdo . BlankLinesBetweenMembers ;
bool startBlockOnSameLine = CodeGenerationProperties . Get ( "StartBlockOnSameLine" , true ) ;
csharpOptions . BracesOnSameLine = startBlockOnSameLine ;
vbOptions . BracesOnSameLine = startBlockOnSameLine ;
csharpOptions . IndentString = cdo . IndentString ;
vbOptions . IndentString = cdo . IndentString ;
o ptions. EmptyLinesBetweenMembers = cdo . BlankLinesBetweenMembers ;
options . BracesOnSameLine = CodeGenerationProperties . Get ( "StartBlockOnSameLine" , true ) ; ;
options . IndentString = cdo . IndentString ;
}
internal static void InitializeCodeGeneratorOptions ( CodeGenerator generator )
{
codeGenerators . Add ( generator ) ;
ApplyCodeGenerationProperties ( generator ) ;
}
public static bool GenerateDocumentComments {
@ -117,7 +118,7 @@ namespace ICSharpCode.SharpDevelop
@@ -117,7 +118,7 @@ namespace ICSharpCode.SharpDevelop
OnAmbienceChanged ( EventArgs . Empty ) ;
}
if ( e . Key = = codeGenerationProperty | | e . Key = = textEditorProperty ) {
ApplyCodeGenerationPropertiesToNRefactory ( ) ;
codeGenerators . ForEach ( ApplyCodeGenerationProperties ) ;
}
}