Browse Source

Fixed SD2-561: Running a single file causes unhandled exception

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@764 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
3af84e5070
  1. BIN
      data/resources/StringResources.de.resources
  2. 2
      src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin
  3. 64
      src/Main/Base/Project/Src/Commands/BuildCommands.cs
  4. 2
      src/Main/Base/Project/Src/Commands/DebugCommands.cs
  5. BIN
      src/Main/StartUp/Project/Resources/StringResources.resources

BIN
data/resources/StringResources.de.resources

Binary file not shown.

2
src/AddIns/BackendBindings/VBNetBinding/Project/VBNetBinding.addin

@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
class = "VBNetBinding.Parser.TParser"/>
</Path>
<Path name = "/SharpDevelop/Dialogs/OptionsDialog/TextEditor">
<Path name = "/SharpDevelop/Dialogs/OptionsDialog/TextEditorOptions">
<DialogPanel id = "VBSpecificOptions"
label = "${res:Dialog.Options.IDEOptions.TextEditor.VB.PanelName}"
class = "VBNetBinding.OptionPanels.VBNetTextEditorPanel"/>

64
src/Main/Base/Project/Src/Commands/BuildCommands.cs

@ -45,13 +45,23 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -45,13 +45,23 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
}
}
public static void AddNoSingleFileCompilationError()
{
LastErrorCount = 1;
LastWarningCount = 0;
TaskService.Add(new Task(null, StringParser.Parse("${res:BackendBindings.ExecutionManager.NoSingleFileCompilation}"), 0, 0, TaskType.Error));
WorkbenchSingleton.Workbench.GetPad(typeof(ErrorList)).BringPadToFront();
}
public override void Run()
{
if (ProjectService.OpenSolution != null) {
Build.BeforeBuild();
Build.BeforeBuild();
if (ProjectService.OpenSolution == null) {
Build.AddNoSingleFileCompilationError();
} else {
Build.ShowResults(ProjectService.OpenSolution.Build());
Build.AfterBuild();
}
Build.AfterBuild();
}
public static void AfterBuild()
@ -64,11 +74,13 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -64,11 +74,13 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
{
public override void Run()
{
if (ProjectService.OpenSolution != null) {
Build.BeforeBuild();
Build.BeforeBuild();
if (ProjectService.OpenSolution == null) {
Build.AddNoSingleFileCompilationError();
} else {
Build.ShowResults(ProjectService.OpenSolution.Rebuild());
Build.AfterBuild();
}
Build.AfterBuild();
}
}
@ -76,8 +88,10 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -76,8 +88,10 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
{
public override void Run()
{
if (ProjectService.OpenSolution != null) {
Build.BeforeBuild();
Build.BeforeBuild();
if (ProjectService.OpenSolution == null) {
Build.AddNoSingleFileCompilationError();
} else {
Build.ShowResults(ProjectService.OpenSolution.Clean());
}
}
@ -87,8 +101,10 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -87,8 +101,10 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
{
public override void Run()
{
if (ProjectService.OpenSolution != null) {
Build.BeforeBuild();
Build.BeforeBuild();
if (ProjectService.OpenSolution == null) {
Build.AddNoSingleFileCompilationError();
} else {
Build.ShowResults(ProjectService.OpenSolution.Publish());
}
}
@ -111,11 +127,13 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -111,11 +127,13 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
public override void Run()
{
if (ProjectService.CurrentProject != null) {
Build.BeforeBuild();
Build.BeforeBuild();
if (ProjectService.OpenSolution == null) {
Build.AddNoSingleFileCompilationError();
} else {
BuildProject.ShowResults(ProjectService.CurrentProject.Build());
Build.AfterBuild();
}
Build.AfterBuild();
}
}
@ -123,11 +141,13 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -123,11 +141,13 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
{
public override void Run()
{
if (ProjectService.CurrentProject != null) {
Build.BeforeBuild();
Build.BeforeBuild();
if (ProjectService.OpenSolution == null) {
Build.AddNoSingleFileCompilationError();
} else {
BuildProject.ShowResults(ProjectService.CurrentProject.Rebuild());
Build.AfterBuild();
}
Build.AfterBuild();
}
}
@ -135,8 +155,10 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -135,8 +155,10 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
{
public override void Run()
{
if (ProjectService.CurrentProject != null) {
Build.BeforeBuild();
Build.BeforeBuild();
if (ProjectService.OpenSolution == null) {
Build.AddNoSingleFileCompilationError();
} else {
BuildProject.ShowResults(ProjectService.CurrentProject.Clean());
}
}
@ -146,8 +168,10 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -146,8 +168,10 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
{
public override void Run()
{
if (ProjectService.CurrentProject != null) {
Build.BeforeBuild();
Build.BeforeBuild();
if (ProjectService.OpenSolution == null) {
Build.AddNoSingleFileCompilationError();
} else {
BuildProject.ShowResults(ProjectService.CurrentProject.Publish());
}
}

2
src/Main/Base/Project/Src/Commands/DebugCommands.cs

@ -15,7 +15,6 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -15,7 +15,6 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
{
public override void Run()
{
Debug.Assert(ProjectService.OpenSolution != null);
new Build().Run();
if (Build.LastErrorCount == 0) {
IProject startupProject = ProjectService.OpenSolution.StartupProject;
@ -31,7 +30,6 @@ namespace ICSharpCode.SharpDevelop.Project.Commands @@ -31,7 +30,6 @@ namespace ICSharpCode.SharpDevelop.Project.Commands
{
public override void Run()
{
Debug.Assert(ProjectService.OpenSolution != null);
new Build().Run();
if (Build.LastErrorCount == 0) {
IProject startupProject = ProjectService.OpenSolution.StartupProject;

BIN
src/Main/StartUp/Project/Resources/StringResources.resources

Binary file not shown.
Loading…
Cancel
Save