Merge branch 'master' into csformatter

Rpinski · Rpinski · commit d0649bad703d · 2014-03-31T01:37:42.000+02:00
diff --git a/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/src/MSpecTestDebugger.cs b/src/AddIns/Analysis/MachineSpecifications/MachineSpecifications/src/MSpecTestDebugger.cs
@@ -28,7 +28,7 @@ namespace ICSharpCode.MachineSpecifications
 	public class MSpecTestDebugger : TestDebuggerBase
 	{
 		public MSpecTestDebugger()
-			: base(new UnitTestDebuggerService(), SD.MessageService, new MSpecUnitTestMonitor())
+			: base(SD.Debugger, SD.MessageService, new MSpecUnitTestMonitor())
 		{
 		}
 
diff --git a/src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestDebuggerService.cs b/src/AddIns/Analysis/UnitTesting/Interfaces/UnitTestDebuggerService.cs
diff --git a/src/AddIns/Analysis/UnitTesting/NUnit/NUnitTestDebugger.cs b/src/AddIns/Analysis/UnitTesting/NUnit/NUnitTestDebugger.cs
@@ -31,7 +31,7 @@ public class NUnitTestDebugger : TestDebuggerBase
 		UnitTestingOptions options;
 		
 		public NUnitTestDebugger()
-			: this(new UnitTestDebuggerService(),
+			: this(SD.Debugger,
 				SD.MessageService,
 				new TestResultsReader(),
 				UnitTestingOptions.Instance.Clone())
diff --git a/src/AddIns/Analysis/UnitTesting/TestRunner/TestDebuggerBase.cs b/src/AddIns/Analysis/UnitTesting/TestRunner/TestDebuggerBase.cs
@@ -33,7 +33,7 @@ public abstract class TestDebuggerBase : TestRunnerBase
 		ITestResultsReader testResultsReader;
 		
 		public TestDebuggerBase()
-			: this(new UnitTestDebuggerService(),
+			: this(SD.Debugger,
 				SD.MessageService,
 				new TestResultsReader())
 		{
diff --git a/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj b/src/AddIns/Analysis/UnitTesting/UnitTesting.csproj
@@ -56,7 +56,6 @@
     <Compile Include="Commands\RunningTestsCondition.cs" />
     <Compile Include="Commands\TestableCondition.cs" />
     <Compile Include="Commands\UnitTestCommands.cs" />
-    <Compile Include="Interfaces\UnitTestDebuggerService.cs" />
     <Compile Include="Pad\UnitTestNodeFactory.cs" />
     <Compile Include="Service\ITestService.cs" />
     <Compile Include="Model\ITest.cs" />
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CaretReferenceHighlightRenderer.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/CaretReferenceHighlightRenderer.cs
@@ -78,6 +78,12 @@ public void Dispose()
 
 		public void Draw(TextView textView, DrawingContext drawingContext)
 		{
+			var codeEditorOptions = editor.Options as ICodeEditorOptions;
+			if ((codeEditorOptions != null) && !codeEditorOptions.HighlightSymbol) {
+				// User has disabled highlighting of symbols
+				return;
+			}
+			
 			if (currentReferences == null) {
 				if (textView.VisualLines.Count == 0)
 					return;
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsPersistence.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsPersistence.cs
@@ -101,7 +101,7 @@ public static CSharpFormattingOptionsPersistence GetProjectOptions(IProject proj
 				if (!projectOptions.ContainsKey(key)) {
 					// Lazily create options container for project
 					projectOptions[key] = new CSharpFormattingOptionsPersistence(
-						csproject.ExtensionProperties,
+						csproject.GlobalPreferences,
 						new CSharpFormattingOptionsContainer((SolutionOptions ?? GlobalOptions).OptionsContainer)
 						{
 							DefaultText = StringParser.Parse("${res:CSharpBinding.Formatting.ProjectOptionReference}")
diff --git a/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs b/src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs
@@ -39,8 +39,8 @@ namespace CSharpBinding
 	/// </summary>
 	public class CSharpProject : CompilableProject
 	{
-		const string ExtensionPropertiesName = "SharpDevelopExtensions";
-		Properties extensionProperties;
+		Properties globalPreferences;
+		FileName globalSettingsFileName;
 		
 		public override IAmbience GetAmbience()
 		{
@@ -66,6 +66,8 @@ public Version LanguageVersion {
 		
 		void Init()
 		{
+			globalPreferences = new Properties();
+			
 			reparseReferencesSensitiveProperties.Add("TargetFrameworkVersion");
 			reparseCodeSensitiveProperties.Add("DefineConstants");
 			reparseCodeSensitiveProperties.Add("AllowUnsafeBlocks");
@@ -124,28 +126,32 @@ public CompilerSettings CompilerSettings {
 			}
 		}
 		
-		public Properties ExtensionProperties
+		public Properties GlobalPreferences
 		{
 			get {
-				return extensionProperties;
+				return globalPreferences;
 			}
 		}
 		
 		public override void ProjectLoaded()
 		{
 			base.ProjectLoaded();
 			
-			// Load project extensions
-			extensionProperties = Properties.Load(LoadProjectExtensions(ExtensionPropertiesName));
+			// Load SD settings file
+			globalSettingsFileName = new FileName(FileName + ".sdsettings");
+			if (File.Exists(globalSettingsFileName)) {
+				globalPreferences = Properties.Load(globalSettingsFileName);
+			}
+			if (globalPreferences == null)
+				globalPreferences = new Properties();
 		}
 		
 		public override void Save(string fileName)
 		{
 			// Save project extensions
-			if (extensionProperties != null && extensionProperties.IsDirty) {
-				var propertiesXElement = extensionProperties.Save();
-				SaveProjectExtensions(ExtensionPropertiesName, propertiesXElement);
-				extensionProperties.IsDirty = false;
+			if (globalPreferences != null && globalPreferences.IsDirty) {
+				globalPreferences.Save(new FileName(fileName + ".sdsettings"));
+				globalPreferences.IsDirty = false;
 			}
 			base.Save(fileName);
 		}
diff --git a/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineContentHost.xaml.cs b/src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineContentHost.xaml.cs
@@ -118,6 +118,7 @@ XamlOutlineNode BuildNode(AXmlElement item)
 		void TreeViewMouseDoubleClick(object sender, MouseButtonEventArgs e)
 		{
 			XamlOutlineNode node = treeView.SelectedItem as XamlOutlineNode;
+			if (node == null) return;
 			editor.Select(node.Marker.Offset, node.EndMarker.Offset - node.Marker.Offset);
 		}
 		
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/AutoCompleteTextBox.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/AutoCompleteTextBox.cs
@@ -140,6 +140,7 @@ void editor_TextArea_TextEntered(object sender, TextCompositionEventArgs e)
 				var binding = DebuggerDotCompletion.PrepareDotCompletion(editor.Text.Substring(0, editor.CaretOffset), context);
 				if (binding == null) return;
 				binding.HandleKeyPressed(editorAdapter, '.');
+				SD.ParserService.ParseFileAsync(context.FileName).FireAndForget();
 			} else {
 				// TODO : implement automated error checking CSharpParser.ParseExpression does not report useful error messages.
 //				Error[] errors;
diff --git a/src/AddIns/Debugger/Debugger.AddIn/Pads/ConsolePad.cs b/src/AddIns/Debugger/Debugger.AddIn/Pads/ConsolePad.cs
@@ -89,6 +89,7 @@ void ShowDotCompletion(StackFrame frame, string currentText)
 			var binding = DebuggerDotCompletion.PrepareDotCompletion(currentText, new DebuggerCompletionContext(frame));
 			if (binding == null) return;
 			binding.HandleKeyPressed(console.TextEditor, '.');
+			SD.ParserService.ParseFileAsync(new ICSharpCode.Core.FileName(frame.NextStatement.Filename)).FireAndForget();
 		}
 		
 		protected override ToolBar BuildToolBar()
diff --git a/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/CodeEditorOptions.cs b/src/AddIns/DisplayBindings/AvalonEdit.AddIn/Src/Options/CodeEditorOptions.cs
@@ -27,7 +27,7 @@
 namespace ICSharpCode.AvalonEdit.AddIn.Options
 {
 	[Serializable]
-	public class CodeEditorOptions : TextEditorOptions, ITextEditorOptions
+	public class CodeEditorOptions : TextEditorOptions, ITextEditorOptions, ICodeEditorOptions
 	{
 		static readonly Lazy<CodeEditorOptions> instance = new Lazy<CodeEditorOptions>(
 			() => PropertyService.Get("CodeEditorOptions", new CodeEditorOptions()));
diff --git a/src/Main/Base/Project/Editor/ICodeEditorOptions.cs b/src/Main/Base/Project/Editor/ICodeEditorOptions.cs
@@ -0,0 +1,94 @@
+﻿// Copyright (c) 2014 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.ComponentModel;
+
+namespace ICSharpCode.SharpDevelop.Editor
+{
+	/// <summary>
+	/// Code editor options.
+	/// </summary>
+	public interface ICodeEditorOptions : INotifyPropertyChanged
+	{
+		bool AllowScrollBelowDocument {
+			get;
+			set;
+		}
+		
+		bool ShowLineNumbers {
+			get;
+			set;
+		}
+
+		bool EnableChangeMarkerMargin {
+			get;
+			set;
+		}
+		
+		bool WordWrap {
+			get;
+			set;
+		}
+		
+		bool CtrlClickGoToDefinition {
+			get;
+			set;
+		}
+		
+		bool MouseWheelZoom {
+			get;
+			set;
+		}
+		
+		bool HighlightBrackets {
+			get;
+			set;
+		}
+		
+		bool HighlightSymbol {
+			get;
+			set;
+		}
+		
+		bool EnableAnimations {
+			get;
+			set;
+		}
+		
+		bool UseSmartIndentation {
+			get;
+			set;
+		}
+		
+		bool EnableFolding {
+			get;
+			set;
+		}
+		
+		bool EnableQuickClassBrowser {
+			get;
+			set;
+		}
+		
+		bool ShowHiddenDefinitions {
+			get;
+			set;
+		}
+	}
+}
diff --git a/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj b/src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj
@@ -147,6 +147,7 @@
     <Compile Include="Editor\DocumentServiceAttribute.cs" />
     <Compile Include="Editor\DocumentUtilities.cs" />
     <Compile Include="Editor\IBracketSearcher.cs" />
+    <Compile Include="Editor\ICodeEditorOptions.cs" />
     <Compile Include="Editor\IDocumentVersionProvider.cs" />
     <Compile Include="Editor\IEditorControlService.cs" />
     <Compile Include="Editor\IEditorUIService.cs" />
diff --git a/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ProjectNode.cs b/src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/TreeNodes/ProjectNode.cs
@@ -130,6 +130,8 @@ public override void ActivateItem()
 		{
 			if (project is MSBuildFileProject) {
 				FileService.OpenFile(project.FileName);
+			} else {
+				ShowProperties();
 			}
 		}
 		
diff --git a/src/Main/SharpDevelop/Project/Solution.cs b/src/Main/SharpDevelop/Project/Solution.cs
@@ -535,7 +535,7 @@ public override object EditValue(ITypeDescriptorContext context, IServiceProvide
 			{
 				var treeNode = AddInTree.GetTreeNode("/SharpDevelop/Dialogs/SolutionFormattingOptionsDialog", false);
 				bool? result = ICSharpCode.SharpDevelop.Commands.OptionsCommand.ShowTreeOptions(
-					StringParser.Parse("${ICSharpCode.SharpDevelop.Project.SolutionFormattingOptions.Title}"),
+					StringParser.Parse("${res:ICSharpCode.SharpDevelop.Project.SolutionFormattingOptions.Title}"),
 					treeNode);
 				if ((bool) result) {
 					// Formatting options have been changed, make solution dirty

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ namespace ICSharpCode.MachineSpecifications`
`28`	`28`	`public class MSpecTestDebugger : TestDebuggerBase`
`29`	`29`	`{`
`30`	`30`	`public MSpecTestDebugger()`
`31`		`- : base(new UnitTestDebuggerService(), SD.MessageService, new MSpecUnitTestMonitor())`
	`31`	`+ : base(SD.Debugger, SD.MessageService, new MSpecUnitTestMonitor())`
`32`	`32`	`{`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public abstract class TestDebuggerBase : TestRunnerBase`
`33`	`33`	`ITestResultsReader testResultsReader;`
`34`	`34`
`35`	`35`	`public TestDebuggerBase()`
`36`		`- : this(new UnitTestDebuggerService(),`
	`36`	`+ : this(SD.Debugger,`
`37`	`37`	`SD.MessageService,`
`38`	`38`	`new TestResultsReader())`
`39`	`39`	`{`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public static CSharpFormattingOptionsPersistence GetProjectOptions(IProject proj`
`101`	`101`	`if (!projectOptions.ContainsKey(key)) {`
`102`	`102`	`// Lazily create options container for project`
`103`	`103`	`projectOptions[key] = new CSharpFormattingOptionsPersistence(`
`104`		`- csproject.ExtensionProperties,`
	`104`	`+ csproject.GlobalPreferences,`
`105`	`105`	`new CSharpFormattingOptionsContainer((SolutionOptions ?? GlobalOptions).OptionsContainer)`
`106`	`106`	`{`
`107`	`107`	`DefaultText = StringParser.Parse("${res:CSharpBinding.Formatting.ProjectOptionReference}")`
Original file line number	Diff line number	Diff line change
`@@ -39,8 +39,8 @@ namespace CSharpBinding`
`39`	`39`	`/// </summary>`
`40`	`40`	`public class CSharpProject : CompilableProject`
`41`	`41`	`{`
`42`		`- const string ExtensionPropertiesName = "SharpDevelopExtensions";`
`43`		`- Properties extensionProperties;`
	`42`	`+ Properties globalPreferences;`
	`43`	`+ FileName globalSettingsFileName;`
`44`	`44`
`45`	`45`	`public override IAmbience GetAmbience()`
`46`	`46`	`{`
`@@ -66,6 +66,8 @@ public Version LanguageVersion {`
`66`	`66`
`67`	`67`	`void Init()`
`68`	`68`	`{`
	`69`	`+ globalPreferences = new Properties();`
	`70`	`+`
`69`	`71`	`reparseReferencesSensitiveProperties.Add("TargetFrameworkVersion");`
`70`	`72`	`reparseCodeSensitiveProperties.Add("DefineConstants");`
`71`	`73`	`reparseCodeSensitiveProperties.Add("AllowUnsafeBlocks");`
`@@ -124,28 +126,32 @@ public CompilerSettings CompilerSettings {`
`124`	`126`	`}`
`125`	`127`	`}`
`126`	`128`
`127`		`- public Properties ExtensionProperties`
	`129`	`+ public Properties GlobalPreferences`
`128`	`130`	`{`
`129`	`131`	`get {`
`130`		`- return extensionProperties;`
	`132`	`+ return globalPreferences;`
`131`	`133`	`}`
`132`	`134`	`}`
`133`	`135`
`134`	`136`	`public override void ProjectLoaded()`
`135`	`137`	`{`
`136`	`138`	`base.ProjectLoaded();`
`137`	`139`
`138`		`- // Load project extensions`
`139`		`- extensionProperties = Properties.Load(LoadProjectExtensions(ExtensionPropertiesName));`
	`140`	`+ // Load SD settings file`
	`141`	`+ globalSettingsFileName = new FileName(FileName + ".sdsettings");`
	`142`	`+ if (File.Exists(globalSettingsFileName)) {`
	`143`	`+ globalPreferences = Properties.Load(globalSettingsFileName);`
	`144`	`+ }`
	`145`	`+ if (globalPreferences == null)`
	`146`	`+ globalPreferences = new Properties();`
`140`	`147`	`}`
`141`	`148`
`142`	`149`	`public override void Save(string fileName)`
`143`	`150`	`{`
`144`	`151`	`// Save project extensions`
`145`		`- if (extensionProperties != null && extensionProperties.IsDirty) {`
`146`		`- var propertiesXElement = extensionProperties.Save();`
`147`		`- SaveProjectExtensions(ExtensionPropertiesName, propertiesXElement);`
`148`		`- extensionProperties.IsDirty = false;`
	`152`	`+ if (globalPreferences != null && globalPreferences.IsDirty) {`
	`153`	`+ globalPreferences.Save(new FileName(fileName + ".sdsettings"));`
	`154`	`+ globalPreferences.IsDirty = false;`
`149`	`155`	`}`
`150`	`156`	`base.Save(fileName);`
`151`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,6 +118,7 @@ XamlOutlineNode BuildNode(AXmlElement item)`
`118`	`118`	`void TreeViewMouseDoubleClick(object sender, MouseButtonEventArgs e)`
`119`	`119`	`{`
`120`	`120`	`XamlOutlineNode node = treeView.SelectedItem as XamlOutlineNode;`
	`121`	`+ if (node == null) return;`
`121`	`122`	`editor.Select(node.Marker.Offset, node.EndMarker.Offset - node.Marker.Offset);`
`122`	`123`	`}`
`123`	`124`