From 1fa584b4f40ff1cbe0671d9cc9fa75ecf39e14eb Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 23 Oct 2005 12:24:54 +0000 Subject: [PATCH] Fixed BOO-539: Forms designer does not hook up events to event handlers. and BOO-538: Syntax colorization of doc-strings with slashes goes awry git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@613 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Boo/BooBinding/Project/Resources/Boo.xshd | 4 ++-- .../Project/Src/Designer/CodeDomVisitor.cs | 23 +++++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/Boo.xshd b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/Boo.xshd index e899e51397..d3330870aa 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/Boo.xshd +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Resources/Boo.xshd @@ -24,9 +24,9 @@ - &<>~!@%^*()-+=|\#/{}[]:;"' , .? + &<>~!@$%^*()-+=|\#/{}[]:;"' , .? - + """ """ diff --git a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/CodeDomVisitor.cs b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/CodeDomVisitor.cs index da5bab5517..12a78a36d3 100644 --- a/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/CodeDomVisitor.cs +++ b/src/AddIns/BackendBindings/Boo/BooBinding/Project/Src/Designer/CodeDomVisitor.cs @@ -209,6 +209,29 @@ namespace Grunwald.BooBinding.Designer if (left != null && _expression != null) _statements.Add(new CodeAssignStatement(left, _expression)); _expression = null; + } else if (op == BinaryOperatorType.InPlaceAddition) { + _expression = null; + node.Left.Accept(this); + CodeEventReferenceExpression left = _expression as CodeEventReferenceExpression; + _expression = null; + node.Right.Accept(this); + if (left != null && _expression != null) + _statements.Add(new CodeAttachEventStatement(left, _expression)); + _expression = null; + } else { + LoggingService.Warn("CodeDomVisitor: ignoring unknown Binary Operator" + op); + } + } + public override void OnCastExpression(CastExpression node) + { + _expression = null; + node.Target.Accept(this); + if (_expression == null) + return; + if (_expression is CodeMethodReferenceExpression) { + _expression = new CodeObjectCreateExpression(ConvTypeRef(node.Type), _expression); + } else { + _expression = new CodeCastExpression(ConvTypeRef(node.Type), _expression); } } public override void OnBlock(Block node)