From 695de9d5af18c0f5bae97b7e28875934970fde2f Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Tue, 2 Jan 2007 00:06:06 +0000 Subject: [PATCH] Fixed SD2-1255. VB.NET code generator options are now initialized. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.1@2253 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../AmbienceService/AmbienceService.cs | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/Main/Base/Project/Src/Services/AmbienceService/AmbienceService.cs b/src/Main/Base/Project/Src/Services/AmbienceService/AmbienceService.cs index 98deebdff9..4c80643aab 100644 --- a/src/Main/Base/Project/Src/Services/AmbienceService/AmbienceService.cs +++ b/src/Main/Base/Project/Src/Services/AmbienceService/AmbienceService.cs @@ -32,13 +32,20 @@ namespace ICSharpCode.SharpDevelop } static void ApplyCodeGenerationPropertiesToNRefactory() - { - Properties p = CodeGenerationProperties; - LanguageProperties.CSharp.CodeGenerator.Options.EmptyLinesBetweenMembers = p.Get("BlankLinesBetweenMembers", true); - LanguageProperties.CSharp.CodeGenerator.Options.BracesOnSameLine = p.Get("StartBlockOnSameLine", true); - + { + CodeGeneratorOptions csharpOptions = LanguageProperties.CSharp.CodeGenerator.Options; + CodeGeneratorOptions vbOptions = LanguageProperties.VBNet.CodeGenerator.Options; System.CodeDom.Compiler.CodeGeneratorOptions cdo = new CodeDOMGeneratorUtility().CreateCodeGeneratorOptions; - LanguageProperties.CSharp.CodeGenerator.Options.IndentString = cdo.IndentString; + + csharpOptions.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; } public static bool GenerateDocumentComments {