GNOME.org
 

[gnome-code-assistance/wip/completion: 19/19] Move Diagnostics under Document namespace

commit 4e7097d698e0fc663ac216b3e4c44a97d92f187e
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Fri Apr 11 18:29:46 2014 +0200

    Move Diagnostics under Document namespace

 README                                             |    2 +-
 backends/go/dbus.go                                |    2 +-
 backends/js/main.js                                |    2 +-
 .../gnome/codeassistance/transport_dbus.js         |    6 +++---
 .../gnome/codeassistance/transport_dbus.py         |    8 ++++----
 .../gnome/codeassistance/transport/dbus.rb         |    2 +-
 backends/vala/dbus.vala                            |    2 +-
 tests/backends/c.json                              |    2 +-
 tests/backends/css.json                            |    2 +-
 tests/backends/go.json                             |    2 +-
 tests/backends/js.json                             |    2 +-
 tests/backends/json.json                           |    2 +-
 tests/backends/python.json                         |    2 +-
 tests/backends/ruby.json                           |    2 +-
 tests/backends/sh.json                             |    2 +-
 tests/backends/vala.json                           |    2 +-
 tests/backends/xml.json                            |    2 +-
 tests/interfaces.json                              |    2 +-
 tests/service                                      |    4 ++--
 19 files changed, 25 insertions(+), 25 deletions(-)
---
diff --git a/README b/README
index 4276bb6..0c41d9d 100644
--- a/README
+++ b/README
@@ -99,7 +99,7 @@ define the code assistance protocol.
 
     // The Diagnostics interface can be implemented on a document to provide
     // diagnostics after parsing.
-    type org.gnome.CodeAssist.v1.Diagnostics {
+    type org.gnome.CodeAssist.v1.Document.Diagnostics {
         // Obtain diagnostic information for the document. The return value
         // is a list of Diagnostic structs. Each diagnostic contains at least
         // a Severity level (e.g. Warning or Error), one or more SourceRange
diff --git a/backends/go/dbus.go b/backends/go/dbus.go
index 9ef56fc..802cfe1 100644
--- a/backends/go/dbus.go
+++ b/backends/go/dbus.go
@@ -79,7 +79,7 @@ func (d *DocumentDbus) Introspect() *introspect.Node {
                        },
 
                        introspect.Interface{
-                               Name: "org.gnome.CodeAssist.v1.Diagnostics",
+                               Name: "org.gnome.CodeAssist.v1.Document.Diagnostics",
                                Methods: []introspect.Method{
                                        {
                                                Name: "Diagnostics",
diff --git a/backends/js/main.js b/backends/js/main.js
index 6a6ea58..5d3e5ce 100644
--- a/backends/js/main.js
+++ b/backends/js/main.js
@@ -15,7 +15,7 @@ Document.prototype = {
     'org.gnome.CodeAssist.v1.Document': {
     },
 
-    'org.gnome.CodeAssist.v1.Diagnostics': {
+    'org.gnome.CodeAssist.v1.Document.Diagnostics': {
         diagnostics: function() {
             return this.diagnostics;
         }
diff --git a/backends/jscommon/gnome/codeassistance/transport_dbus.js 
b/backends/jscommon/gnome/codeassistance/transport_dbus.js
index 7b41f2f..f445605 100644
--- a/backends/jscommon/gnome/codeassistance/transport_dbus.js
+++ b/backends/jscommon/gnome/codeassistance/transport_dbus.js
@@ -38,7 +38,7 @@ var DocumentIface = '<node>
 </node>';
 
 var DiagnosticsIface = '<node>                                                  \
-  <interface name="org.gnome.CodeAssist.v1.Diagnostics">                        \
+  <interface name="org.gnome.CodeAssist.v1.Document.Diagnostics">               \
     <method name="Diagnostics">                                                 \
       <arg direction="out" type="a(ua((x(xx)(xx))s)a(x(xx)(xx))s)" name="diagnostics"/> \
     </method>                                                                   \
@@ -118,7 +118,7 @@ Diagnostics.prototype = {
     },
 
     Diagnostics: function() {
-        let diagnostics = this.doc['org.gnome.CodeAssist.v1.Diagnostics'].diagnostics.call(this.doc);
+        let diagnostics = 
this.doc['org.gnome.CodeAssist.v1.Document.Diagnostics'].diagnostics.call(this.doc);
 
         return diagnostics.map(function (d) {
             return d.toTuple();
@@ -219,7 +219,7 @@ var ServerServices = {
 
 var DocumentServices = {
     'org.gnome.CodeAssist.v1.Document': Document,
-    'org.gnome.CodeAssist.v1.Diagnostics': Diagnostics
+    'org.gnome.CodeAssist.v1.Document.Diagnostics': Diagnostics
 };
 
 const FreedesktopDBusProxy = Gio.DBusProxy.makeProxyWrapper(FreedesktopDBusIface);
diff --git a/backends/pycommon/gnome/codeassistance/transport_dbus.py 
b/backends/pycommon/gnome/codeassistance/transport_dbus.py
index ff596a0..26ee5ec 100644
--- a/backends/pycommon/gnome/codeassistance/transport_dbus.py
+++ b/backends/pycommon/gnome/codeassistance/transport_dbus.py
@@ -46,8 +46,8 @@ class Document(dbus.service.Object):
         # This is so nasty, I don't have words for it. I'm sincerely sorry!
         # If the Document interface gets any methods, please remove this
         # atrocity!!
-        if not 'org.gnome.CodeAssist.v1.Document' in ret:
-            find = "<interface name=\"org.gnome.CodeAssist.v1.Diagnostics\">"
+        if not '<interface name="org.gnome.CodeAssist.v1.Document"' in ret:
+            find = "<interface name=\"org.gnome.CodeAssist.v1.Document.Diagnostics\">"
             ret = ret.replace(find, "<interface name=\"org.gnome.CodeAssist.v1.Document\"/>\n  " + find)
 
         return ret
@@ -56,12 +56,12 @@ class Diagnostics(dbus.service.Object):
     """Diagnostics interface.
 
     Implementations can inherit from this class to implement the
-    org.gnome.CodeAssist.v1.Diagnostics interface. Diagnostics are served from
+    org.gnome.CodeAssist.v1.Document.Diagnostics interface. Diagnostics are served from
     the .diagnostics field which should be set to a list of types.Diagnostic
     objects.
     """
 
-    interface = 'org.gnome.CodeAssist.v1.Diagnostics'
+    interface = 'org.gnome.CodeAssist.v1.Document.Diagnostics'
 
     def __init__(self):
         super(Diagnostics, self).__init__()
diff --git a/backends/rbcommon/gnome/codeassistance/transport/dbus.rb 
b/backends/rbcommon/gnome/codeassistance/transport/dbus.rb
index 161276a..8ccbc72 100644
--- a/backends/rbcommon/gnome/codeassistance/transport/dbus.rb
+++ b/backends/rbcommon/gnome/codeassistance/transport/dbus.rb
@@ -76,7 +76,7 @@ module Gnome::CodeAssistance::DBus
     end
 
     module Diagnostics
-        dbus_interface 'org.gnome.CodeAssist.v1.Diagnostics' do
+        dbus_interface 'org.gnome.CodeAssist.v1.Document.Diagnostics' do
             dbus_method :Diagnostics, "out diagnostics:a(ua((x(xx)(xx))s)a(x(xx)(xx))s)" do
                 return [ _doc diagnostics collect { |d| d.to_tuple }]
             end
diff --git a/backends/vala/dbus.vala b/backends/vala/dbus.vala
index ad94a34..4ceada2 100644
--- a/backends/vala/dbus.vala
+++ b/backends/vala/dbus.vala
@@ -31,7 +31,7 @@ public class DocumentIface : Object
        }
 }
 
-[DBus (name = "org.gnome.CodeAssist.v1.Diagnostics")]
+[DBus (name = "org.gnome.CodeAssist.v1.Document.Diagnostics")]
 public class DiagnosticsIface : Object
 {
        private Document? d_document;
diff --git a/tests/backends/c.json b/tests/backends/c.json
index 4e75898..72ea92b 100644
--- a/tests/backends/c.json
+++ b/tests/backends/c.json
@@ -1,7 +1,7 @@
 {
   "language": "c",
   "interfaces": ["org.gnome.CodeAssist.v1.Project"],
-  "document_interfaces": ["org.gnome.CodeAssist.v1.Diagnostics"],
+  "document_interfaces": ["org.gnome.CodeAssist.v1.Document.Diagnostics"],
   "diagnostics": [
     {
       "parse": {
diff --git a/tests/backends/css.json b/tests/backends/css.json
index 7325616..6bbb361 100644
--- a/tests/backends/css.json
+++ b/tests/backends/css.json
@@ -1,5 +1,5 @@
 {
   "language": "css",
   "interfaces": [],
-  "document_interfaces": ["org.gnome.CodeAssist.v1.Diagnostics"]
+  "document_interfaces": ["org.gnome.CodeAssist.v1.Document.Diagnostics"]
 }
diff --git a/tests/backends/go.json b/tests/backends/go.json
index dbb6642..9126d9b 100644
--- a/tests/backends/go.json
+++ b/tests/backends/go.json
@@ -1,7 +1,7 @@
 {
   "language": "go",
   "interfaces": ["org.gnome.CodeAssist.v1.Project"],
-  "document_interfaces": ["org.gnome.CodeAssist.v1.Diagnostics"],
+  "document_interfaces": ["org.gnome.CodeAssist.v1.Document.Diagnostics"],
   "diagnostics": [
     {
       "parse": {
diff --git a/tests/backends/js.json b/tests/backends/js.json
index 40d6a1d..f9dcc33 100644
--- a/tests/backends/js.json
+++ b/tests/backends/js.json
@@ -1,7 +1,7 @@
 {
   "language": "js",
   "interfaces": [],
-  "document_interfaces": ["org.gnome.CodeAssist.v1.Diagnostics"],
+  "document_interfaces": ["org.gnome.CodeAssist.v1.Document.Diagnostics"],
   "diagnostics": [
     {
       "parse": {
diff --git a/tests/backends/json.json b/tests/backends/json.json
index 960ffa9..6e2dce9 100644
--- a/tests/backends/json.json
+++ b/tests/backends/json.json
@@ -1,7 +1,7 @@
 {
   "language": "json",
   "interfaces": [],
-  "document_interfaces": ["org.gnome.CodeAssist.v1.Diagnostics"],
+  "document_interfaces": ["org.gnome.CodeAssist.v1.Document.Diagnostics"],
   "diagnostics": [
     {
       "parse": {
diff --git a/tests/backends/python.json b/tests/backends/python.json
index 4a0d693..086ffc4 100644
--- a/tests/backends/python.json
+++ b/tests/backends/python.json
@@ -1,7 +1,7 @@
 {
   "language": "python",
   "interfaces": [],
-  "document_interfaces": ["org.gnome.CodeAssist.v1.Diagnostics"],
+  "document_interfaces": ["org.gnome.CodeAssist.v1.Document.Diagnostics"],
   "diagnostics": [
     {
       "parse": {
diff --git a/tests/backends/ruby.json b/tests/backends/ruby.json
index 7833d38..c8cf5bf 100644
--- a/tests/backends/ruby.json
+++ b/tests/backends/ruby.json
@@ -1,7 +1,7 @@
 {
   "language": "ruby",
   "interfaces": [],
-  "document_interfaces": ["org.gnome.CodeAssist.v1.Diagnostics"],
+  "document_interfaces": ["org.gnome.CodeAssist.v1.Document.Diagnostics"],
   "diagnostics": [
     {
       "parse": {
diff --git a/tests/backends/sh.json b/tests/backends/sh.json
index 20056de..1e7df17 100644
--- a/tests/backends/sh.json
+++ b/tests/backends/sh.json
@@ -1,5 +1,5 @@
 {
   "language": "sh",
   "interfaces": [],
-  "document_interfaces": ["org.gnome.CodeAssist.v1.Diagnostics"]
+  "document_interfaces": ["org.gnome.CodeAssist.v1.Document.Diagnostics"]
 }
diff --git a/tests/backends/vala.json b/tests/backends/vala.json
index 55ef263..506f479 100644
--- a/tests/backends/vala.json
+++ b/tests/backends/vala.json
@@ -1,5 +1,5 @@
 {
   "language": "vala",
   "interfaces": [],
-  "document_interfaces": ["org.gnome.CodeAssist.v1.Diagnostics"]
+  "document_interfaces": ["org.gnome.CodeAssist.v1.Document.Diagnostics"]
 }
diff --git a/tests/backends/xml.json b/tests/backends/xml.json
index cdae475..804af16 100644
--- a/tests/backends/xml.json
+++ b/tests/backends/xml.json
@@ -1,5 +1,5 @@
 {
   "language": "xml",
   "interfaces": [],
-  "document_interfaces": ["org.gnome.CodeAssist.v1.Diagnostics"]
+  "document_interfaces": ["org.gnome.CodeAssist.v1.Document.Diagnostics"]
 }
diff --git a/tests/interfaces.json b/tests/interfaces.json
index 9c62b5c..d811169 100644
--- a/tests/interfaces.json
+++ b/tests/interfaces.json
@@ -27,7 +27,7 @@
   "org.gnome.CodeAssist.v1.Document": {
   },
 
-  "org.gnome.CodeAssist.v1.Diagnostics": {
+  "org.gnome.CodeAssist.v1.Document.Diagnostics": {
     "Diagnostics": [
       {"name": "result", "direction": "out", "type": "a(ua((x(xx)(xx))s)a(x(xx)(xx))s)"}
     ]
diff --git a/tests/service b/tests/service
index 83ef98e..9fff955 100755
--- a/tests/service
+++ b/tests/service
@@ -320,10 +320,10 @@ class ServiceTest:
         return iface.ParseAll(self.file_path(path), [d.to_tuple() for d in docs], (0, 0), '', {})
 
     def verify_parse_diagnostics(self, path, obj, diagnostics):
-        with self.test_interface(path, 'org.gnome.CodeAssist.v1.Diagnostics') as t:
+        with self.test_interface(path, 'org.gnome.CodeAssist.v1.Document.Diagnostics') as t:
             t()
 
-        diag = dbus.Interface(obj, 'org.gnome.CodeAssist.v1.Diagnostics')
+        diag = dbus.Interface(obj, 'org.gnome.CodeAssist.v1.Document.Diagnostics')
 
         ret = [gcatypes.Diagnostic.from_tuple(dd) for dd in diag.Diagnostics()]
         orig = [gcatypes.Diagnostic.from_json(dd) for dd in diagnostics]
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]