From e0ef6fd8b6eddf3f59e5e53a3764d382e6c57434 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Sun, 11 Jul 2010 15:42:32 +0000 Subject: [PATCH] - fixed IsInComment - fixed CC at start of file git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/vbnet@6089 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../VBNetBinding/Project/Src/VBNetCompletionBinding.cs | 2 +- .../Project/Src/VBNet/VBNetExpressionFinder.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs index 55a4f8ff4a..118bacb9aa 100644 --- a/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs +++ b/src/AddIns/BackendBindings/VBNetBinding/Project/Src/VBNetCompletionBinding.cs @@ -110,7 +110,7 @@ namespace ICSharpCode.VBNetBinding if (inXml) { return true; } else { - string lineText = editor.Document.GetLine(t.Location.Line).Text; + string lineText = editor.Document.GetLine(editor.Caret.Line).Text; bool inString = false; bool inComment = false; diff --git a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/VBNet/VBNetExpressionFinder.cs b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/VBNet/VBNetExpressionFinder.cs index 0773f442e9..3e5778d7da 100644 --- a/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/VBNet/VBNetExpressionFinder.cs +++ b/src/Main/ICSharpCode.SharpDevelop.Dom/Project/Src/VBNet/VBNetExpressionFinder.cs @@ -80,7 +80,7 @@ namespace ICSharpCode.SharpDevelop.Dom.VBNet ExpressionContext context = p.IsIdentifierExpected ? ExpressionContext.IdentifierExpected : GetContext(block); if (lastExpressionStartOffset < 0) - return new ExpressionResult(null, context); + return new ExpressionResult(null, DomRegion.Empty, context, p.GetExpectedSet()); return MakeResult(text, lastExpressionStartOffset, offset, context, p.GetExpectedSet()); }