Browse Source

Fixed some minor bugs.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3596 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
commit
22cc955540
  1. 8
      data/templates/file/CSharp/CSharp.Struct.xft
  2. 5
      src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs
  3. 2
      src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs
  4. 4
      src/Main/Base/Test/CheckAssemblyFlags.cs
  5. 3
      src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/ResolveVisitor.cs
  6. 12
      src/prepareRelease.bat

8
data/templates/file/CSharp/CSharp.Struct.xft

@ -57,14 +57,14 @@ namespace ${StandardNamespace} @@ -57,14 +57,14 @@ namespace ${StandardNamespace}
return member.GetHashCode();
}
public static bool operator ==(${ClassName} lhs, ${ClassName} rhs)
public static bool operator ==(${ClassName} left, ${ClassName} right)
{
return lhs.Equals(rhs);
return left.Equals(right);
}
public static bool operator !=(${ClassName} lhs, ${ClassName} rhs)
public static bool operator !=(${ClassName} left, ${ClassName} right)
{
return !(lhs.Equals(rhs)); // use operator == and negate result
return !left.Equals(right);
}
#endregion
}

5
src/AddIns/BackendBindings/CSharpBinding/Project/Src/CSharpCompletionBinding.cs

@ -97,9 +97,8 @@ namespace CSharpBinding @@ -97,9 +97,8 @@ namespace CSharpBinding
return true;
} else if (ch == '>') {
if (IsInComment(editor)) return false;
LineSegment segment = editor.Document.GetLineSegmentForOffset(editor.ActiveTextAreaControl.Caret.Offset);
TextWord sign = segment.GetWord(editor.ActiveTextAreaControl.Caret.Column - 1);
if (sign.Word == "-") {
char prevChar = cursor > 1 ? editor.Document.GetCharAt(cursor - 1) : ' ';
if (prevChar == '-') {
editor.ShowCompletionWindow(new PointerArrowCompletionDataProvider(), ch);
return true;

2
src/Main/Base/Project/Src/Gui/Workbench/Layouts/SdiWorkspaceLayout.cs

@ -542,7 +542,7 @@ namespace ICSharpCode.SharpDevelop.Gui @@ -542,7 +542,7 @@ namespace ICSharpCode.SharpDevelop.Gui
{
SdiWorkspaceWindow f = (SdiWorkspaceWindow)sender;
f.CloseEvent -= CloseWindowEvent;
foreach (IViewContent vc in f.ViewContents) {
foreach (IViewContent vc in f.ViewContents.ToArray()) {
((IWorkbench)wbForm).CloseContent(vc);
}
if (f == oldSelectedWindow) {

4
src/Main/Base/Test/CheckAssemblyFlags.cs

@ -25,8 +25,8 @@ namespace ICSharpCode.SharpDevelop.Tests @@ -25,8 +25,8 @@ namespace ICSharpCode.SharpDevelop.Tests
string corflags = FileUtility.GetSdkPath("corflags.exe");
Assert.IsNotNull(corflags, "corflags.exe not found, this test requires the .NET SDK!");
ProcessRunner pr = new ProcessRunner();
Console.WriteLine(corflags + " " + assembly);
pr.Start(corflags, assembly);
Console.WriteLine(corflags + " \"" + assembly + "\"");
pr.Start(corflags, "\"" + assembly + "\"");
if (!pr.WaitForExit(5000)) {
pr.Kill();
throw new InvalidOperationException("Timeout running corflags");

3
src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/NRefactoryResolver/ResolveVisitor.cs

@ -523,11 +523,10 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver @@ -523,11 +523,10 @@ namespace ICSharpCode.SharpDevelop.Dom.NRefactoryResolver
public override object VisitPointerReferenceExpression(PointerReferenceExpression pointerReferenceExpression, object data)
{
ResolveResult targetRR = Resolve(pointerReferenceExpression.TargetObject);
if (targetRR == null)
if (targetRR == null || targetRR.ResolvedType == null)
return null;
PointerReturnType type = targetRR.ResolvedType.CastToDecoratingReturnType<PointerReturnType>();
if (type != null) {
TypeResolveResult typeRR = targetRR as TypeResolveResult;
return resolver.ResolveMember(type.BaseType, pointerReferenceExpression.Identifier,
pointerReferenceExpression.TypeArguments,
NRefactoryResolver.IsInvoked(pointerReferenceExpression),

12
src/prepareRelease.bat

@ -1,12 +0,0 @@ @@ -1,12 +0,0 @@
rem Prepares a release by updating the changelog
pushd Tools
%windir%\microsoft.net\framework\v3.5\msbuild /t:PrepareRelease /property:Configuration=Release Tools.build
@popd
@IF %ERRORLEVEL% NEQ 0 PAUSE & EXIT
@echo.
@echo.
@echo.
@echo PrepareRelease.bat completed successfully.
@echo The change log has been updated and a REVISION file containing the current revision number has been created.
@echo.
@pause
Loading…
Cancel
Save