Browse Source

fix "surround with comment" for XAML; fix exception in XAML CC occurring when trying to type '<'

pull/45/merge
Siegfried Pammer 12 years ago
parent
commit
98c509f281
  1. 7
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin
  2. 3
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlContext.cs
  3. 6
      src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlLanguageBinding.cs

7
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlBinding.addin

@ -43,6 +43,13 @@
<CodeCompletionBinding id = "XAML" extensions = ".xaml" class = "ICSharpCode.XamlBinding.XamlCodeCompletionBinding"/> <CodeCompletionBinding id = "XAML" extensions = ".xaml" class = "ICSharpCode.XamlBinding.XamlCodeCompletionBinding"/>
</Path> </Path>
<Path name="/SharpDevelop/Workbench/LanguageBindings">
<LanguageBinding
id="XAML"
class="ICSharpCode.XamlBinding.XamlLanguageBinding"
extensions=".xaml" />
</Path>
<Path name="/SharpDevelop/ViewContent/TextEditor/Extensions"> <Path name="/SharpDevelop/ViewContent/TextEditor/Extensions">
<TextEditorExtension <TextEditorExtension
id="XAML" id="XAML"

3
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlContext.cs

@ -47,8 +47,9 @@ namespace ICSharpCode.XamlBinding
if (asmIndex >= 0) { if (asmIndex >= 0) {
string asmName = name.Substring(asmIndex + ";assembly=".Length); string asmName = name.Substring(asmIndex + ";assembly=".Length);
asm = compilation.ReferencedAssemblies.FirstOrDefault(a => a.AssemblyName == asmName) ?? compilation.MainAssembly; asm = compilation.ReferencedAssemblies.FirstOrDefault(a => a.AssemblyName == asmName) ?? compilation.MainAssembly;
name = name.Substring(0, asmIndex);
} }
string[] parts = name.Substring(0, asmIndex).Split('.'); string[] parts = name.Split('.');
var @namespace = FindNamespace(asm, parts); var @namespace = FindNamespace(asm, parts);
if (@namespace != null) yield return @namespace; if (@namespace != null) yield return @namespace;
} else { } else {

6
src/AddIns/BackendBindings/XamlBinding/XamlBinding/XamlLanguageBinding.cs

@ -13,7 +13,6 @@ namespace ICSharpCode.XamlBinding
/// <summary> /// <summary>
/// Description of XamlTextEditorExtension. /// Description of XamlTextEditorExtension.
/// </summary> /// </summary>
[TextEditorService]
public class XamlTextEditorExtension : XmlEditor.XmlTextEditorExtension public class XamlTextEditorExtension : XmlEditor.XmlTextEditorExtension
{ {
// XamlColorizer colorizer; // XamlColorizer colorizer;
@ -65,4 +64,9 @@ namespace ICSharpCode.XamlBinding
} }
} }
} }
public class XamlLanguageBinding : XmlEditor.XmlLanguageBinding
{
}
} }

Loading…
Cancel
Save