[Pkg-cli-apps-commits] [SCM] monodevelop-vala branch, master, updated. debian/2.8.6.3-1-5-gdb70b72
Julian Taylor
jtaylor.debian at googlemail.com
Sun Apr 22 15:47:12 UTC 2012
The following commit has been merged in the master branch:
commit db70b729b605ff3d5b60717e858757d10bcc113b
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Apr 22 17:45:15 2012 +0200
add libafrodite-0.12-compat.patch
fixes crash on completion
diff --git a/debian/patches/libafrodite-0.12-compat.patch b/debian/patches/libafrodite-0.12-compat.patch
new file mode 100644
index 0000000..712a727
--- /dev/null
+++ b/debian/patches/libafrodite-0.12-compat.patch
@@ -0,0 +1,513 @@
+Description: be compatible with libafrodite-0.12
+Origin: https://github.com/mono/monodevelop/pull/118
+Author: severinheiniger at gmail.com
+diff --git a/Navigation/LanguageItemNodeBuilder.cs b/Navigation/LanguageItemNodeBuilder.cs
+index 0b6f7fc..12fd10b 100644
+--- a/Navigation/LanguageItemNodeBuilder.cs
++++ b/Navigation/LanguageItemNodeBuilder.cs
+@@ -102,8 +102,8 @@ public override int CompareObjects (ITreeNavigator thisNode, ITreeNavigator othe
+ otherCN = otherNode.DataItem as Symbol;
+
+ if (null != thisCN && null != otherCN) {
+- return Array.IndexOf<string>(types, thisCN.SymbolType) -
+- Array.IndexOf<string>(types, otherCN.SymbolType);
++ return Array.IndexOf<string>(types, thisCN.MemberType) -
++ Array.IndexOf<string>(types, otherCN.MemberType);
+ }
+ }
+
+diff --git a/Parser/Afrodite.cs b/Parser/Afrodite.cs
+index dd2b8d3..6eaeec2 100644
+--- a/Parser/Afrodite.cs
++++ b/Parser/Afrodite.cs
+@@ -38,7 +38,7 @@
+ namespace MonoDevelop.ValaBinding.Parser.Afrodite
+ {
+ /// <summary>
+- /// Afrodite completion engine - interface for queueing source and getting ASTs
++ /// Afrodite completion engine - interface for queueing source and getting CodeDOMs
+ /// </summary>
+ internal class CompletionEngine
+ {
+@@ -64,21 +64,21 @@ public void QueueSourcefile (string path, bool isVapi, bool isGlib)
+ }
+
+ /// <summary>
+- /// Attempt to acquire the current AST
++ /// Attempt to acquire the current CodeDOM
+ /// </summary>
+ /// <returns>
+- /// A <see cref="Ast"/>: null if unable to acquire
++ /// A <see cref="CodeDom"/>: null if unable to acquire
+ /// </returns>
+- public Ast TryAcquireAst ()
++ public CodeDom TryAcquireCodeDom ()
+ {
+- IntPtr ast = afrodite_completion_engine_get_ast (instance);
+- return (ast == IntPtr.Zero)? null: new Ast (ast, this);
++ IntPtr codeDom = afrodite_completion_engine_get_codedom (instance);
++ return (codeDom == IntPtr.Zero)? null: new CodeDom (codeDom, this);
+ }
+
+ /// <summary>
+- /// Release the given AST (required for continued parsing)
++ /// Release the given CodeDOM (required for continued parsing)
+ /// </summary>
+- public void ReleaseAst (Ast ast)
++ public void ReleaseCodeDom (CodeDom codeDom)
+ {
+ // Obsolete
+ }
+@@ -95,7 +95,7 @@ public void ReleaseAst (Ast ast)
+ bool is_vapi, bool is_glib);
+
+ [DllImport("afrodite")]
+- static extern IntPtr afrodite_completion_engine_get_ast (IntPtr instance);
++ static extern IntPtr afrodite_completion_engine_get_codedom (IntPtr instance);
+
+ #endregion
+ }
+@@ -129,10 +129,10 @@ public Symbol (IntPtr instance)
+ /// <summary>
+ /// The type of this symbol
+ /// </summary>
+- public DataType DataType {
++ public DataType SymbolType {
+ get {
+- IntPtr datatype = afrodite_symbol_get_symbol_data_type (instance);
+- return (IntPtr.Zero == datatype)? null: new DataType (afrodite_symbol_get_symbol_data_type (instance));
++ IntPtr datatype = afrodite_symbol_get_symbol_type (instance);
++ return (IntPtr.Zero == datatype)? null: new DataType (afrodite_symbol_get_symbol_type (instance));
+ }
+ }
+
+@@ -142,7 +142,7 @@ public Symbol (IntPtr instance)
+ public DataType ReturnType {
+ get {
+ IntPtr datatype = afrodite_symbol_get_return_type (instance);
+- return (IntPtr.Zero == datatype)? null: new DataType (afrodite_symbol_get_symbol_data_type (instance));
++ return (IntPtr.Zero == datatype)? null: new DataType (afrodite_symbol_get_return_type (instance));
+ }
+ }
+
+@@ -189,8 +189,8 @@ public Symbol (IntPtr instance)
+ /// <summary>
+ /// The symbol type (class, method, ...) of this symbol
+ /// </summary>
+- public string SymbolType {
+- get{ return Utils.GetSymbolType (afrodite_symbol_get_symbol_type (instance)); }
++ public string MemberType {
++ get{ return Utils.GetMemberType (afrodite_symbol_get_member_type (instance)); }
+ }
+
+ /// <summary>
+@@ -220,7 +220,7 @@ public Symbol (IntPtr instance)
+ /// The icon to be used for this symbol
+ /// </summary>
+ public string Icon {
+- get{ return GetIconForType (SymbolType, Accessibility); }
++ get{ return GetIconForType (MemberType, Accessibility); }
+ }
+
+ /// <summary>
+@@ -352,10 +352,10 @@ public static string GetIconForType (string nodeType, SymbolAccessibility visibi
+ static extern IntPtr afrodite_symbol_get_parameters (IntPtr instance);
+
+ [DllImport("afrodite")]
+- static extern int afrodite_symbol_get_symbol_type (IntPtr instance);
++ static extern int afrodite_symbol_get_member_type (IntPtr instance);
+
+ [DllImport("afrodite")]
+- static extern IntPtr afrodite_symbol_get_symbol_data_type (IntPtr instance);
++ static extern IntPtr afrodite_symbol_get_symbol_type (IntPtr instance);
+
+ [DllImport("afrodite")]
+ static extern IntPtr afrodite_symbol_get_return_type (IntPtr instance);
+@@ -364,25 +364,25 @@ public static string GetIconForType (string nodeType, SymbolAccessibility visibi
+ }
+
+ /// <summary>
+- /// Represents a Vala AST
++ /// Represents a Vala CodeDOM
+ /// </summary>
+ /// <remarks>
+ /// MUST be disposed for parsing to continue
+ /// </remarks>
+- internal class Ast: IDisposable
++ internal class CodeDom: IDisposable
+ {
+ CompletionEngine engine;
+
+ /// <summary>
+- /// Create a new AST wrapper
++ /// Create a new CodeDOM wrapper
+ /// </summary>
+ /// <param name="instance">
+- /// A <see cref="IntPtr"/>: The native pointer for this AST
++ /// A <see cref="IntPtr"/>: The native pointer for this CodeDOM
+ /// </param>
+ /// <param name="engine">
+- /// A <see cref="CompletionEngine"/>: The completion engine to which this AST belongs
++ /// A <see cref="CompletionEngine"/>: The completion engine to which this CodeDOM belongs
+ /// </param>
+- public Ast (IntPtr instance, CompletionEngine engine)
++ public CodeDom (IntPtr instance, CompletionEngine engine)
+ {
+ this.instance = instance;
+ this.engine = engine;
+@@ -390,7 +390,7 @@ public Ast (IntPtr instance, CompletionEngine engine)
+
+ public QueryResult GetSymbolsForPath (string path)
+ {
+- return new QueryResult (afrodite_ast_get_symbols_for_path (instance, new QueryOptions ().Instance, path));
++ return new QueryResult (afrodite_code_dom_get_symbols_for_path (instance, new QueryOptions ().Instance, path));
+ }
+
+ /// <summary>
+@@ -398,7 +398,7 @@ public QueryResult GetSymbolsForPath (string path)
+ /// </summary>
+ public Symbol LookupSymbolAt (string filename, int line, int column)
+ {
+- IntPtr symbol = afrodite_ast_lookup_symbol_at (instance, filename, line, column);
++ IntPtr symbol = afrodite_code_dom_lookup_symbol_at (instance, filename, line, column);
+ return (IntPtr.Zero == symbol)? null: new Symbol (symbol);
+ }
+
+@@ -410,7 +410,7 @@ public Symbol Lookup (string fully_qualified_name, out Symbol parent)
+ IntPtr parentInstance = IntPtr.Zero,
+ result = IntPtr.Zero;
+
+- result = afrodite_ast_lookup (instance, fully_qualified_name, out parentInstance);
++ result = afrodite_code_dom_lookup (instance, fully_qualified_name, out parentInstance);
+ parent = (IntPtr.Zero == parentInstance)? null: new Symbol (parentInstance);
+ return (IntPtr.Zero == result)? null: new Symbol (result);
+ }
+@@ -420,7 +420,7 @@ public Symbol Lookup (string fully_qualified_name, out Symbol parent)
+ /// </summary>
+ public Symbol GetSymbolForNameAndPath (string name, string path, int line, int column)
+ {
+- IntPtr result = afrodite_ast_get_symbol_for_name_and_path (instance, QueryOptions.Standard ().Instance,
++ IntPtr result = afrodite_code_dom_get_symbol_for_name_and_path (instance, QueryOptions.Standard ().Instance,
+ name, path, line, column);
+ if (IntPtr.Zero != result) {
+ QueryResult qresult = new QueryResult (result);
+@@ -432,12 +432,12 @@ public Symbol GetSymbolForNameAndPath (string name, string path, int line, int c
+ }
+
+ /// <summary>
+- /// Get the source files used to create this AST
++ /// Get the source files used to create this CodeDOM
+ /// </summary>
+ public List<SourceFile> SourceFiles {
+ get {
+ List<SourceFile> files = new List<SourceFile> ();
+- IntPtr sourceFiles = afrodite_ast_get_source_files (instance);
++ IntPtr sourceFiles = afrodite_code_dom_get_source_files (instance);
+
+ if (IntPtr.Zero != sourceFiles) {
+ ValaList list = new ValaList (sourceFiles);
+@@ -453,7 +453,7 @@ public Symbol GetSymbolForNameAndPath (string name, string path, int line, int c
+ /// </summary>
+ public SourceFile LookupSourceFile (string filename)
+ {
+- IntPtr sourceFile = afrodite_ast_lookup_source_file (instance, filename);
++ IntPtr sourceFile = afrodite_code_dom_lookup_source_file (instance, filename);
+ return (IntPtr.Zero == sourceFile)? null: new SourceFile (sourceFile);
+ }
+
+@@ -466,53 +466,53 @@ public SourceFile LookupSourceFile (string filename)
+ }
+
+ [DllImport("afrodite")]
+- static extern IntPtr afrodite_ast_get_symbols_for_path (IntPtr instance, IntPtr options, string path);
++ static extern IntPtr afrodite_code_dom_get_symbols_for_path (IntPtr instance, IntPtr options, string path);
+
+ [DllImport("afrodite")]
+- static extern IntPtr afrodite_ast_lookup_symbol_at (IntPtr instance, string filename, int line, int column);
++ static extern IntPtr afrodite_code_dom_lookup_symbol_at (IntPtr instance, string filename, int line, int column);
+
+ [DllImport("afrodite")]
+- static extern IntPtr afrodite_ast_lookup (IntPtr instance, string fully_qualified_name, out IntPtr parent);
++ static extern IntPtr afrodite_code_dom_lookup (IntPtr instance, string fully_qualified_name, out IntPtr parent);
+
+ [DllImport("afrodite")]
+- static extern IntPtr afrodite_ast_get_symbol_for_name_and_path (IntPtr instance, IntPtr options,
++ static extern IntPtr afrodite_code_dom_get_symbol_for_name_and_path (IntPtr instance, IntPtr options,
+ string symbol_qualified_name, string path,
+ int line, int column);
+
+ [DllImport("afrodite")]
+- static extern IntPtr afrodite_ast_get_source_files (IntPtr instance);
++ static extern IntPtr afrodite_code_dom_get_source_files (IntPtr instance);
+
+ [DllImport("afrodite")]
+- static extern IntPtr afrodite_ast_lookup_source_file (IntPtr instance, string filename);
++ static extern IntPtr afrodite_code_dom_lookup_source_file (IntPtr instance, string filename);
+
+ #endregion
+
+ #region IDisposable implementation
+
+ /// <summary>
+- /// Release this AST for reuse
++ /// Release this CodeDOM for reuse
+ /// </summary>
+ public void Dispose ()
+ {
+- engine.ReleaseAst (this);
++ engine.ReleaseCodeDom (this);
+ }
+
+ #endregion
+ }
+
+ /// <summary>
+- /// Utility class for dumping an AST to Console.Out
++ /// Utility class for dumping a CodeDOM to Console.Out
+ /// </summary>
+- internal class AstDumper
++ internal class CodeDomDumper
+ {
+- public AstDumper ()
++ public CodeDomDumper ()
+ {
+ instance = afrodite_ast_dumper_new ();
+ }
+
+- public void Dump (Ast ast, string filterSymbol)
++ public void Dump (CodeDom codeDom, string filterSymbol)
+ {
+- afrodite_ast_dumper_dump (instance, ast.Instance, filterSymbol);
++ afrodite_ast_dumper_dump (instance, codeDom.Instance, filterSymbol);
+ }
+
+ #region P/Invokes
+@@ -523,7 +523,7 @@ public void Dump (Ast ast, string filterSymbol)
+ static extern IntPtr afrodite_ast_dumper_new ();
+
+ [DllImport("afrodite")]
+- static extern void afrodite_ast_dumper_dump (IntPtr instance, IntPtr ast, string filterSymbol);
++ static extern void afrodite_ast_dumper_dump (IntPtr instance, IntPtr codeDom, string filterSymbol);
+
+ #endregion
+ }
+@@ -600,7 +600,7 @@ public ResultItem (IntPtr instance)
+ }
+
+ /// <summary>
+- /// Options for querying an AST
++ /// Options for querying a CodeDOM
+ /// </summary>
+ internal class QueryOptions
+ {
+@@ -846,7 +846,7 @@ internal List<T> ToTypedList<T> (Func<IntPtr,T> factory)
+ }
+
+ /// <summary>
+- /// Class to represent an AST source file
++ /// Class to represent a CodeDOM source file
+ /// </summary>
+ internal class SourceFile
+ {
+@@ -1161,16 +1161,16 @@ public static List<string> GetPackagePaths (string package)
+ return list;
+ }
+
+- public static string GetSymbolType (int symbolType)
++ public static string GetMemberType (int memberType)
+ {
+- return Marshal.PtrToStringAuto (afrodite_utils_symbols_get_symbol_type_description (symbolType));
++ return Marshal.PtrToStringAuto (afrodite_utils_symbols_get_symbol_type_description (memberType));
+ }
+
+ [DllImport("afrodite")]
+ static extern IntPtr afrodite_utils_get_package_paths (string package, IntPtr codeContext, string[] vapiDirs);
+
+ [DllImport("afrodite")]
+- static extern IntPtr afrodite_utils_symbols_get_symbol_type_description (int symbolType);
++ static extern IntPtr afrodite_utils_symbols_get_symbol_type_description (int memberType);
+ }
+ }
+
+diff --git a/Parser/ProjectInformation.cs b/Parser/ProjectInformation.cs
+index c5718ae..31b0bae 100644
+--- a/Parser/ProjectInformation.cs
++++ b/Parser/ProjectInformation.cs
+@@ -109,13 +109,13 @@ internal List<Afrodite.Symbol> CompleteType (string typename, string filename, i
+ List<Afrodite.Symbol> nodes = new List<Afrodite.Symbol> ();
+ if (!DepsInstalled){ return nodes; }
+
+- using (Afrodite.Ast parseTree = engine.TryAcquireAst ()) {
++ using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
+ if (null != parseTree) {
+ Afrodite.Symbol symbol = parseTree.GetSymbolForNameAndPath (typename, filename, linenum, column);
+ if (null == symbol){ LoggingService.LogDebug ("CompleteType: Unable to lookup {0} in {1} at {2}:{3}", typename, filename, linenum, column); }
+ else{ nodes = symbol.Children; }
+ } else {
+- LoggingService.LogDebug ("CompleteType: Unable to acquire ast");
++ LoggingService.LogDebug ("CompleteType: Unable to acquire codedom");
+ }
+ }
+
+@@ -170,7 +170,7 @@ internal List<Afrodite.Symbol> Complete (string symbol, string filename, int lin
+ if (!DepsInstalled){ return nodes; }
+
+
+- using (Afrodite.Ast parseTree = engine.TryAcquireAst ()) {
++ using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
+ if (null != parseTree) {
+ LoggingService.LogDebug ("Complete: Looking up symbol at {0}:{1}:{2}", filename, line, column);
+ Afrodite.Symbol sym = parseTree.GetSymbolForNameAndPath (symbol, filename, line, column);
+@@ -180,7 +180,7 @@ internal List<Afrodite.Symbol> Complete (string symbol, string filename, int lin
+ AddResults (nodes, results);
+ }
+ } else {
+- LoggingService.LogDebug ("Complete: Unable to acquire ast");
++ LoggingService.LogDebug ("Complete: Unable to acquire codedom");
+ }
+ }
+
+@@ -191,14 +191,14 @@ internal Afrodite.Symbol GetFunction (string name, string filename, int line, in
+ {
+ if (!DepsInstalled){ return null; }
+
+- using (Afrodite.Ast parseTree = engine.TryAcquireAst ()) {
++ using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
+ if (null != parseTree) {
+ LoggingService.LogDebug ("GetFunction: Looking up symbol at {0}:{1}:{2}", filename, line, column);
+ Afrodite.Symbol symbol = parseTree.GetSymbolForNameAndPath (name, filename, line, column);
+ LoggingService.LogDebug ("GetFunction: Got {0}", (null == symbol)? "null": symbol.Name);
+ return symbol;
+ } else {
+- LoggingService.LogDebug ("GetFunction: Unable to acquire ast");
++ LoggingService.LogDebug ("GetFunction: Unable to acquire codedom");
+ }
+ }
+
+@@ -212,16 +212,16 @@ public string GetExpressionType (string symbol, string filename, int line, int c
+ {
+ if (!DepsInstalled){ return symbol; }
+
+- using (Afrodite.Ast parseTree = engine.TryAcquireAst ()) {
++ using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
+ if (null != parseTree) {
+ LoggingService.LogDebug ("GetExpressionType: Looking up symbol at {0}:{1}:{2}", filename, line, column);
+ Afrodite.Symbol sym = parseTree.LookupSymbolAt (filename, line, column);
+ if (null != sym) {
+- LoggingService.LogDebug ("Got {0}", sym.DataType.TypeName);
+- return sym.DataType.TypeName;
++ LoggingService.LogDebug ("Got {0}", sym.SymbolType.TypeName);
++ return sym.SymbolType.TypeName;
+ }
+ } else {
+- LoggingService.LogDebug ("GetExpressionType: Unable to acquire ast");
++ LoggingService.LogDebug ("GetExpressionType: Unable to acquire codedom");
+ }
+ }
+
+@@ -236,12 +236,12 @@ internal List<Afrodite.Symbol> GetOverloads (string name, string filename, int l
+ List<Afrodite.Symbol> overloads = new List<Afrodite.Symbol> ();
+ if (!DepsInstalled){ return overloads; }
+
+- using (Afrodite.Ast parseTree = engine.TryAcquireAst ()) {
++ using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
+ if (null != parseTree) {
+ Afrodite.Symbol symbol = parseTree.GetSymbolForNameAndPath (name, filename, line, column);
+ overloads = new List<Afrodite.Symbol> (){ symbol };
+ } else {
+- LoggingService.LogDebug ("GetOverloads: Unable to acquire ast");
++ LoggingService.LogDebug ("GetOverloads: Unable to acquire codedom");
+ }
+ }
+
+@@ -255,8 +255,8 @@ internal List<Afrodite.Symbol> GetConstructorsForType (string typename, string f
+ {
+ List<Afrodite.Symbol> functions = new List<Afrodite.Symbol> ();
+ foreach (Afrodite.Symbol node in CompleteType (typename, filename, line, column, null)) {
+- if ("constructor".Equals (node.SymbolType, StringComparison.OrdinalIgnoreCase) ||
+- "creationmethod".Equals (node.SymbolType, StringComparison.OrdinalIgnoreCase)) {
++ if ("constructor".Equals (node.MemberType, StringComparison.OrdinalIgnoreCase) ||
++ "creationmethod".Equals (node.MemberType, StringComparison.OrdinalIgnoreCase)) {
+ functions.Add (node);
+ }
+ }
+@@ -292,12 +292,12 @@ internal void GetTypesVisibleFrom (string filename, int line, int column, ValaCo
+ parent = parent.Parent)
+ {
+ AddResults (parent.Children.FindAll (delegate (Afrodite.Symbol sym){
+- return 0 <= Array.IndexOf (containerTypes, sym.SymbolType.ToLower ());
++ return 0 <= Array.IndexOf (containerTypes, sym.MemberType.ToLower ());
+ }), results);
+ }
+ }
+
+- using (Afrodite.Ast parseTree = engine.TryAcquireAst ()) {
++ using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
+ if (null == parseTree){ return; }
+
+ AddResults (GetNamespacesForFile (filename), results);
+@@ -306,13 +306,14 @@ internal void GetTypesVisibleFrom (string filename, int line, int column, ValaCo
+ if (null != file) {
+ Afrodite.Symbol parent;
+ foreach (Afrodite.DataType directive in file.UsingDirectives) {
++ if (directive.Symbol == null) { continue; }
+ Afrodite.Symbol ns = parseTree.Lookup (directive.Symbol.FullyQualifiedName, out parent);
+ if (null != ns) {
+ containers = new List<Afrodite.Symbol> ();
+ AddResults (new Afrodite.Symbol[]{ ns }, results);
+ foreach (Afrodite.Symbol child in ns.Children) {
+ foreach (string containerType in containerTypes) {
+- if (containerType.Equals (child.SymbolType, StringComparison.OrdinalIgnoreCase))
++ if (containerType.Equals (child.MemberType, StringComparison.OrdinalIgnoreCase))
+ containers.Add (child);
+ }
+ }
+@@ -387,7 +388,7 @@ List<Afrodite.Symbol> GetSymbolsForFile (string file, IEnumerable<string> desire
+
+ if (!DepsInstalled){ return classes; }
+
+- using (Afrodite.Ast parseTree = engine.TryAcquireAst ()) {
++ using (Afrodite.CodeDom parseTree = engine.TryAcquireCodeDom ()) {
+ if (null != parseTree){
+ Afrodite.SourceFile sourceFile = parseTree.LookupSourceFile (file);
+ if (null != sourceFile) {
+@@ -395,7 +396,7 @@ List<Afrodite.Symbol> GetSymbolsForFile (string file, IEnumerable<string> desire
+ if (null != symbols) {
+ foreach (Afrodite.Symbol symbol in symbols) {
+ foreach (string containerType in desiredTypes) {
+- if (containerType.Equals (symbol.SymbolType, StringComparison.OrdinalIgnoreCase))
++ if (containerType.Equals (symbol.MemberType, StringComparison.OrdinalIgnoreCase))
+ classes.Add (symbol);
+ }
+ }
+@@ -404,7 +405,7 @@ List<Afrodite.Symbol> GetSymbolsForFile (string file, IEnumerable<string> desire
+ LoggingService.LogDebug ("GetClassesForFile: Unable to lookup source file {0}", file);
+ }
+ } else {
+- LoggingService.LogDebug ("GetClassesForFile: Unable to acquire ast");
++ LoggingService.LogDebug ("GetClassesForFile: Unable to acquire codedom");
+ }
+
+ }
+diff --git a/Parser/ValaDocumentParser.cs b/Parser/ValaDocumentParser.cs
+index f5a15b8..adae51b 100644
+--- a/Parser/ValaDocumentParser.cs
++++ b/Parser/ValaDocumentParser.cs
+@@ -66,7 +66,7 @@ public override ParsedDocument Parse (ProjectDom dom, string fileName, string co
+ child.SourceReferences[0].File != node.SourceReferences[0].File){ continue; }
+ lastLine = Math.Max (lastLine, child.SourceReferences[0].LastLine+1);
+
+- switch (child.SymbolType.ToLower ()) {
++ switch (child.MemberType.ToLower ()) {
+ case "class":
+ members.Add (new DomType (new CompilationUnit (fileName), ClassType.Class, child.Name, new DomLocation (child.SourceReferences[0].FirstLine, 1), string.Empty, new DomRegion (child.SourceReferences[0].FirstLine, int.MaxValue, child.SourceReferences[0].LastLine, int.MaxValue), new List<IMember> ()));
+ break;
+@@ -103,7 +103,7 @@ public override ParsedDocument Parse (ProjectDom dom, string fileName, string co
+ members.Add (new DomEvent (child.Name, Modifiers.None, new DomLocation (child.SourceReferences[0].FirstLine, 1), new DomReturnType ()));
+ break;
+ default:
+- MonoDevelop.Core.LoggingService.LogDebug ("ValaDocumentParser: Unsupported member type: {0}", child.SymbolType);
++ MonoDevelop.Core.LoggingService.LogDebug ("ValaDocumentParser: Unsupported member type: {0}", child.MemberType);
+ break;
+ }// Switch on node type
+ }// Collect members
diff --git a/debian/patches/series b/debian/patches/series
index 9c34077..172e90e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
use-vala-0.14.patch
+libafrodite-0.12-compat.patch
--
monodevelop-vala
More information about the Pkg-cli-apps-commits
mailing list