Browse Source

Fixed little issues.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@9 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Mike Krüger 21 years ago
parent
commit
d24e1c13cb
  1. 4
      src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs
  2. 17
      src/Main/Base/Project/Src/Project/MSBuildProject.cs

4
src/Main/Base/Project/Src/Gui/Pads/ProjectBrowser/ProjectBrowserControl.cs

@ -118,8 +118,8 @@ namespace ICSharpCode.SharpDevelop.Project @@ -118,8 +118,8 @@ namespace ICSharpCode.SharpDevelop.Project
}
}
}
treeView.SelectedNode = null;
ProjectService.CurrentProject = null;
// treeView.SelectedNode = null;
// ProjectService.CurrentProject = null;
}
public void ViewSolution(Solution solution)

17
src/Main/Base/Project/Src/Project/MSBuildProject.cs

@ -266,6 +266,7 @@ namespace ICSharpCode.SharpDevelop.Project @@ -266,6 +266,7 @@ namespace ICSharpCode.SharpDevelop.Project
//
readonly static Regex normalError = new Regex(@"^(?<file>\S.*)\((?<line>\d+),(?<column>\d+)\):\s+(?<error>\w+)\s+(?<number>[\d\w]+):\s+(?<message>.*)$", RegexOptions.Compiled);
readonly static Regex generalError = new Regex(@"^(?<error>\S.+)\s+(?<number>[\d\w]+):\s+(?<message>.*)$", RegexOptions.Compiled);
readonly static Regex projectName = new Regex(@"^Project\s+\""(?<name>[^""]*)\""", RegexOptions.Compiled);
static CompilerError GetCompilerError(string line, string workingPath)
{
@ -316,9 +317,19 @@ namespace ICSharpCode.SharpDevelop.Project @@ -316,9 +317,19 @@ namespace ICSharpCode.SharpDevelop.Project
string line = reader.ReadLine();
if (line != null) {
TaskService.BuildMessageViewCategory.AppendText(line + Environment.NewLine);
CompilerError error = GetCompilerError(line, workingDirectory);
if (error != null) {
results.Errors.Add(error);
Match match = projectName.Match(line);
if (match.Success) {
string name = match.Result("${name}");
if (name != null) {
workingDirectory = Path.GetDirectoryName(name);
}
} else {
CompilerError error = GetCompilerError(line, workingDirectory);
if (error != null) {
results.Errors.Add(error);
}
}
results.Output.Add(line);
}

Loading…
Cancel
Save