[gnome-code-assistance/wip/vala: 15/20] [backends/vala] Split diagnostics in separate file

[Jesse van den Kieboom <jessevdk src gnome org>]

commit f90ef36f6e9d1f5c8b1dca33a2f9822d8aa2c9f6
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Fri Nov 15 13:05:38 2013 +0100

    [backends/vala] Split diagnostics in separate file

 backends/vala/Makefile.am      |    1 +
 backends/vala/diagnostics.vala |  136 ++++++++++++++++++++++++++++++++++++++++
 backends/vala/service.vala     |   98 -----------------------------
 3 files changed, 137 insertions(+), 98 deletions(-)
---
diff --git a/backends/vala/Makefile.am b/backends/vala/Makefile.am
index 8023be1..6819a62 100644
--- a/backends/vala/Makefile.am
+++ b/backends/vala/Makefile.am
@@ -6,6 +6,7 @@ backends_vala_vala_SOURCES =                    \
        backends/vala/options.vala              \
        backends/vala/types.vala                \
        backends/vala/dbus.vala                 \
+       backends/vala/diagnostics.vala          \
        backends/vala/document.vala             \
        backends/vala/service.vala
 
diff --git a/backends/vala/diagnostics.vala b/backends/vala/diagnostics.vala
new file mode 100644
index 0000000..7a5f8a3
--- /dev/null
+++ b/backends/vala/diagnostics.vala
@@ -0,0 +1,136 @@
+/*
+ * This file is part of gnome-code-assistance.
+ *
+ * Copyright (C) 2013 - Melissa Wen <melissa srw gmail com>
+ * Copyright (C) 2013 - Jesse van den Kieboom <jessevdk gnome org>
+ *
+ * gnome-code-assistance is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * gnome-code-assistance is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with gnome-code-assistance.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+using global::Vala;
+
+namespace Gca.Backends.Vala
+{
+
+public class Diagnostics : Report
+{
+       private Diagnostic[] d_diagnostics;
+       public string path { get; set; }
+
+       public Diagnostics(string path)
+       {
+               base();
+
+               this.path = path;
+
+               d_diagnostics = new Diagnostic[20];
+               d_diagnostics.length = 0;
+       }
+
+       private void diags_report(SourceReference? source, string message, Severity severity)
+       {
+               if (source == null || source.file == null || source.file.filename == null)
+               {
+                       return;
+               }
+
+               if (source.file.filename != path)
+               {
+                       return;
+               }
+
+               var start = SourceLocation() {
+                       line = source.begin.line,
+                       column = source.begin.column
+               };
+
+               var end = SourceLocation() {
+                       line = source.end.line,
+                       column = source.end.column
+               };
+
+               if (start.compare_to(end) > 0)
+               {
+                       var tmp = end;
+
+                       end = start;
+                       start = tmp;
+               }
+
+               var range = SourceRange() {
+                       file = 0,
+                       start = start,
+                       end = end
+               };
+
+               d_diagnostics += Diagnostic() {
+                       severity = severity,
+                       fixits = new Fixit[] {},
+                       locations = new SourceRange[] {range},
+                       message = message
+               };
+       }
+
+       public Diagnostic[] diagnostics
+       {
+               get { return d_diagnostics; }
+       }
+
+       public override void err(SourceReference? source, string message)
+       {
+               log("GcaVala", LogLevelFlags.LEVEL_DEBUG, "[err]: %s", message);
+
+               diags_report(source, message, Severity.ERROR);
+       }
+
+       public override void warn(SourceReference? source, string message)
+       {
+               log("GcaVala", LogLevelFlags.LEVEL_DEBUG, "[warn]: %s", message);
+
+               if (!enable_warnings)
+               {
+                       return;
+               }
+
+               diags_report(source, message, Severity.WARNING);
+       }
+
+       public override void depr(SourceReference? source, string message)
+       {
+               log("GcaVala", LogLevelFlags.LEVEL_DEBUG, "[depr]: %s", message);
+
+               if (!enable_warnings)
+               {
+                       return;
+               }
+
+               diags_report(source, message, Severity.DEPRECATED);
+       }
+
+       public override void note(SourceReference? source, string message)
+       {
+               log("GcaVala", LogLevelFlags.LEVEL_DEBUG, "[note]: %s", message);
+
+               if (!enable_warnings)
+               {
+                       return;
+               }
+
+               diags_report(source, message, Severity.INFO);
+       }
+}
+
+}
+
+/* vi:ts=4: */
diff --git a/backends/vala/service.vala b/backends/vala/service.vala
index db9a236..0a0c4d0 100644
--- a/backends/vala/service.vala
+++ b/backends/vala/service.vala
@@ -23,104 +23,6 @@ using global::Vala;
 namespace Gca.Backends.Vala
 {
 
-public class Diagnostics : Report
-{
-       private Diagnostic[] d_diagnostics;
-       public string path { get; set; }
-
-       public Diagnostics(string path)
-       {
-               this.path = path;
-
-               d_diagnostics = new Diagnostic[20];
-               d_diagnostics.length = 0;
-       }
-
-       private void diags_report(SourceReference? source, string message, Severity severity)
-       {
-               if (source == null || source.file == null || source.file.filename == null)
-               {
-                       return;
-               }
-
-               if (source.file.filename != path)
-               {
-                       return;
-               }
-
-               var start = SourceLocation() {
-                       line = source.begin.line,
-                       column = source.begin.column
-               };
-
-               var end = SourceLocation() {
-                       line = source.end.line,
-                       column = source.end.column
-               };
-
-               if (start.compare_to(end) > 0)
-               {
-                       var tmp = end;
-
-                       end = start;
-                       start = tmp;
-               }
-
-               var range = SourceRange() {
-                       file = 0,
-                       start = start,
-                       end = end
-               };
-
-               d_diagnostics += Diagnostic() {
-                       severity = severity,
-                       fixits = new Fixit[] {},
-                       locations = new SourceRange[] {range},
-                       message = message
-               };
-       }
-
-       public Diagnostic[] diagnostics
-       {
-               get { return d_diagnostics; }
-       }
-
-       public override void err(SourceReference? source, string message)
-       {
-               diags_report(source, message, Severity.ERROR);
-       }
-
-       public override void warn(SourceReference? source, string message)
-       {
-               if (!enable_warnings)
-               {
-                       return;
-               }
-
-               diags_report(source, message, Severity.WARNING);
-       }
-
-       public override void depr(SourceReference? source, string message)
-       {
-               if (!enable_warnings)
-               {
-                       return;
-               }
-
-               diags_report(source, message, Severity.DEPRECATED);
-       }
-
-       public override void note(SourceReference? source, string message)
-       {
-               if (!enable_warnings)
-               {
-                       return;
-               }
-
-               diags_report(source, message, Severity.INFO);
-       }
-}
-
 public class Service : Object
 {
        public void parse(Document doc, HashTable<string, Variant> options) throws Error