Browse Source

- fixed build

- added GridLength value completion
- enabled XamlColorizer

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4395 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Siegfried Pammer 17 years ago
parent
commit
f62ce01d44
  1. 14
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs
  2. 4
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs
  3. 2
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlColorizerServer.cs

14
src/AddIns/BackendBindings/XamlBinding/XamlBinding/CompletionDataHelper.cs

@ -68,7 +68,7 @@ namespace ICSharpCode.XamlBinding @@ -68,7 +68,7 @@ namespace ICSharpCode.XamlBinding
string wordBeforeIndex = text.GetWordBeforeOffset(offset);
if (active != null && parent != null)
if (active != null && parent != active)
description = XamlContextDescription.AtTag;
if (elementStartIndex > -1 &&
@ -532,9 +532,15 @@ namespace ICSharpCode.XamlBinding @@ -532,9 +532,15 @@ namespace ICSharpCode.XamlBinding
yield return new XamlCodeCompletionItem(p, textPrefix + p.Name);
break;
case ClassType.Struct:
if (c.FullyQualifiedName == "System.Boolean") {
yield return new DefaultCompletionItem("True");
yield return new DefaultCompletionItem("False");
switch (c.FullyQualifiedName) {
case "System.Boolean":
yield return new DefaultCompletionItem("True");
yield return new DefaultCompletionItem("False");
break;
case "System.Windows.GridLength":
yield return new DefaultCompletionItem("Auto");
yield return new DefaultCompletionItem("*");
break;
}
break;
case ClassType.Delegate:

4
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlCodeCompletionBinding.cs

@ -139,10 +139,8 @@ namespace ICSharpCode.XamlBinding @@ -139,10 +139,8 @@ namespace ICSharpCode.XamlBinding
if (!XmlParser.IsInsideAttributeValue(editor.Document.Text, editor.Caret.Offset) && context.Description != XamlContextDescription.InAttributeValue) {
var list = CompletionDataHelper.CreateListForContext(context) as XamlCompletionItemList;
string starter = editor.Document.Text.GetWordBeforeOffset(editor.Caret.Offset).Trim('<', '>');
if (!string.IsNullOrEmpty(starter) && !starter.EndsWith(StringComparison.Ordinal, ' ', '\t', '\n', '\r')) {
list.SuggestedItem = list.Items.FirstOrDefault(item => item.Text.StartsWith(starter, StringComparison.OrdinalIgnoreCase));
if (!string.IsNullOrEmpty(starter) && !starter.EndsWith(StringComparison.Ordinal, ' ', '\t', '\n', '\r'))
list.PreselectionLength = starter.Length;
}
editor.ShowCompletionWindow(list);
return true;
} else {

2
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlColorizerServer.cs

@ -19,7 +19,7 @@ namespace ICSharpCode.XamlBinding @@ -19,7 +19,7 @@ namespace ICSharpCode.XamlBinding
/// </summary>
public static class XamlColorizerServer
{
const bool enableHighlighting = false;
const bool enableHighlighting = true;
public static void InitializeServer()
{

Loading…
Cancel
Save