From 0492e3b0a9287942728f2e0a46000c2cd8093d6a Mon Sep 17 00:00:00 2001
From: guillermooo <guillermo.lopez@outlook.com>
Date: Sun, 23 Aug 2015 09:38:19 +0200
Subject: [PATCH] refactor

---
 analyzer.py              |  4 ++--
 lib/analyzer/analyzer.py |  2 +-
 lib/analyzer/response.py | 12 ++++++++----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/analyzer.py b/analyzer.py
index ffc8f5b..8214471 100644
--- a/analyzer.py
+++ b/analyzer.py
@@ -51,7 +51,7 @@ def plugin_loaded():
 
 def _init():
     global g_server
-    _logger.debug('starting dart analyzer')
+    _logger.info('starting dart analyzer')
 
     try:
         g_server = AnalysisServer()
@@ -63,7 +63,7 @@ def _init():
         print('==============================================')
         return
 
-    print('Dart: Analyzer started.')
+    # print('Dart: Starting analysis server...')
 
 
 def plugin_unloaded():
diff --git a/lib/analyzer/analyzer.py b/lib/analyzer/analyzer.py
index b87a76f..994139e 100644
--- a/lib/analyzer/analyzer.py
+++ b/lib/analyzer/analyzer.py
@@ -362,7 +362,7 @@ def run(self):
 
                 if isinstance(resp, Response):
                     if isinstance(resp.result, ServerGetVersionResult):
-                        print('Dart: Analysis Server version:', resp.result.version)
+                        print('Dart: Running analysis server version', resp.result.version)
                         continue
 
                     if isinstance(resp.result, CompletionGetSuggestionsResult):
diff --git a/lib/analyzer/response.py b/lib/analyzer/response.py
index 40643f9..45aa5bf 100644
--- a/lib/analyzer/response.py
+++ b/lib/analyzer/response.py
@@ -48,14 +48,14 @@ def make(self):
                     yield data
                     break
 
-                view = get_active_view()
-                if view and data.get('id') in self.server.request_ids[view.id()]:
-                    yield self.make_request(data, view.id())
+                if self.validate(data):
+                    yield self.make_request(data)
                     continue
 
                 yield event_classifier(data)
 
-    def make_request(self, data, view_id):
+    def make_request(self, data):
+        view_id = get_active_view().id()
         request_id = data['id']
         response_type = self.server.request_ids[view_id][request_id]
         del self.server.request_ids[view_id][request_id]
@@ -66,6 +66,10 @@ def make_request(self, data, view_id):
         else:
             return response_type().to_response(request_id)
 
+    def validate(self, data):
+        view = get_active_view()
+        return view and (data.get('id') in self.server.request_ids[view.id()])
+
 
 def is_result_response(data):
     return data.get('event') == 'search.results'