Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit a4c105a

Browse files
author
gumme
committed
Merge remote-tracking branch 'upstream/master'
2 parents daf7734 + 1d892dd commit a4c105a

127 files changed

Lines changed: 6273 additions & 618 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎SharpDevelop.sln‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,6 @@ Global
373373
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Debug|Any CPU.Build.0 = Debug|Any CPU
374374
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.ActiveCfg = Release|Any CPU
375375
{40CA84D4-ACFC-4646-9CDD-B87262D34093}.Release|Any CPU.Build.0 = Release|Any CPU
376-
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
377-
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.Build.0 = Debug|Any CPU
378-
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.ActiveCfg = Release|Any CPU
379-
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.Build.0 = Release|Any CPU
380376
{0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
381377
{0162E499-42D0-409B-AA25-EED21F75336B}.Debug|Any CPU.Build.0 = Debug|Any CPU
382378
{0162E499-42D0-409B-AA25-EED21F75336B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -501,6 +497,10 @@ Global
501497
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Debug|Any CPU.Build.0 = Debug|Any CPU
502498
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.ActiveCfg = Release|Any CPU
503499
{3DF4060F-5EE0-41CF-8096-F27355FD5511}.Release|Any CPU.Build.0 = Release|Any CPU
500+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
501+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Debug|Any CPU.Build.0 = Debug|Any CPU
502+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.ActiveCfg = Release|Any CPU
503+
{0502FCF7-72F4-4587-936B-D0238CD0E072}.Release|Any CPU.Build.0 = Release|Any CPU
504504
EndGlobalSection
505505
GlobalSection(SolutionProperties) = preSolution
506506
HideSolutionNode = FALSE

‎src/AddIns/Analysis/UnitTesting/NUnit/NUnitConsoleApplication.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ static bool IsPlatformTarget32BitOrAnyCPU(IProject project)
254254
MSBuildBasedProject msbuildProject = project as MSBuildBasedProject;
255255
if (msbuildProject != null) {
256256
string platformTarget = msbuildProject.GetEvaluatedProperty("PlatformTarget");
257-
return String.Equals(platformTarget, "x86", StringComparison.OrdinalIgnoreCase)
257+
return string.IsNullOrEmpty(platformTarget) || String.Equals(platformTarget, "x86", StringComparison.OrdinalIgnoreCase)
258258
|| String.Equals(platformTarget, "AnyCPU", StringComparison.OrdinalIgnoreCase);
259259
}
260260
return false;

‎src/AddIns/Analysis/UnitTesting/Pad/UnitTestNode.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ public UnitTestNode(ITest test)
3737
if (test == null)
3838
throw new ArgumentNullException("test");
3939
this.test = test;
40+
if (IsVisible) {
41+
test.DisplayNameChanged += test_NameChanged;
42+
test.ResultChanged += test_ResultChanged;
43+
}
4044
}
4145

4246
protected override void OnIsVisibleChanged()

‎src/AddIns/BackendBindings/CSharpBinding/Project/Src/FormattingStrategy/CSharpFormattingOptionsPersistence.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public static CSharpFormattingOptionsPersistence GetProjectOptions(IProject proj
9191
if (!projectOptions.ContainsKey(key)) {
9292
// Lazily create options container for project
9393
projectOptions[key] = new CSharpFormattingOptionsPersistence(
94-
csproject.ExtensionProperties,
94+
csproject.GlobalPreferences,
9595
new CSharpFormattingOptionsContainer((SolutionOptions ?? GlobalOptions).OptionsContainer)
9696
{
9797
DefaultText = StringParser.Parse("${res:CSharpBinding.Formatting.ProjectOptionReference}")

‎src/AddIns/BackendBindings/CSharpBinding/Project/Src/Project/CSharpProject.cs‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ namespace CSharpBinding
3939
/// </summary>
4040
public class CSharpProject : CompilableProject
4141
{
42-
const string ExtensionPropertiesName = "SharpDevelopExtensions";
43-
Properties extensionProperties;
42+
Properties globalPreferences;
43+
FileName globalSettingsFileName;
4444

4545
public override IAmbience GetAmbience()
4646
{
@@ -66,6 +66,8 @@ public Version LanguageVersion {
6666

6767
void Init()
6868
{
69+
globalPreferences = new Properties();
70+
6971
reparseReferencesSensitiveProperties.Add("TargetFrameworkVersion");
7072
reparseCodeSensitiveProperties.Add("DefineConstants");
7173
reparseCodeSensitiveProperties.Add("AllowUnsafeBlocks");
@@ -124,28 +126,32 @@ public CompilerSettings CompilerSettings {
124126
}
125127
}
126128

127-
public Properties ExtensionProperties
129+
public Properties GlobalPreferences
128130
{
129131
get {
130-
return extensionProperties;
132+
return globalPreferences;
131133
}
132134
}
133135

134136
public override void ProjectLoaded()
135137
{
136138
base.ProjectLoaded();
137139

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();
140147
}
141148

142149
public override void Save(string fileName)
143150
{
144151
// 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;
149155
}
150156
base.Save(fileName);
151157
}

‎src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlOutlineContentHost.xaml.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ XamlOutlineNode BuildNode(AXmlElement item)
118118
void TreeViewMouseDoubleClick(object sender, MouseButtonEventArgs e)
119119
{
120120
XamlOutlineNode node = treeView.SelectedItem as XamlOutlineNode;
121+
if (node == null) return;
121122
editor.Select(node.Marker.Offset, node.EndMarker.Offset - node.Marker.Offset);
122123
}
123124

‎src/AddIns/Debugger/Debugger.AddIn/Pads/AutoCompleteTextBox.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ void editor_TextArea_TextEntered(object sender, TextCompositionEventArgs e)
140140
var binding = DebuggerDotCompletion.PrepareDotCompletion(editor.Text.Substring(0, editor.CaretOffset), context);
141141
if (binding == null) return;
142142
binding.HandleKeyPressed(editorAdapter, '.');
143+
SD.ParserService.ParseFileAsync(context.FileName).FireAndForget();
143144
} else {
144145
// TODO : implement automated error checking CSharpParser.ParseExpression does not report useful error messages.
145146
// Error[] errors;

‎src/AddIns/Debugger/Debugger.AddIn/Pads/ClassBrowserSupport.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public DebuggerProcessTreeNode(DebuggerProcessAssemblyList assemblyList)
144144

145145
protected override object GetModel()
146146
{
147-
return process;
147+
return assemblyList;
148148
}
149149

150150
protected override IModelCollection<object> ModelChildren {

‎src/AddIns/Debugger/Debugger.AddIn/Pads/ConsolePad.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ void ShowDotCompletion(StackFrame frame, string currentText)
8989
var binding = DebuggerDotCompletion.PrepareDotCompletion(currentText, new DebuggerCompletionContext(frame));
9090
if (binding == null) return;
9191
binding.HandleKeyPressed(console.TextEditor, '.');
92+
SD.ParserService.ParseFileAsync(new ICSharpCode.Core.FileName(frame.NextStatement.Filename)).FireAndForget();
9293
}
9394

9495
protected override ToolBar BuildToolBar()

‎src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@
232232
<Compile Include="Src\PackageManagementServiceProvider.cs" />
233233
<Compile Include="Src\IPackageRepositoryExtensions.cs" />
234234
<Compile Include="Src\PackageRepositoryFactoryEventArgs.cs" />
235+
<Compile Include="Src\PackagesForSelectedPageQuery.cs" />
235236
<Compile Include="Src\ParentPackagesOperationEventArgs.cs" />
236237
<Compile Include="Src\ProjectBuilder.cs" />
237238
<Compile Include="Src\ProjectRootElementExtensions.cs" />

0 commit comments

Comments
 (0)