Dart Kythe indexer refactoring to gather all variable declaration logic into one method

pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart

 // Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'dart:convert';
 
 import 'package:analyzer/dart/ast/ast.dart';
 import 'package:analyzer/dart/ast/standard_resolution_map.dart';
 import 'package:analyzer/dart/ast/syntactic_entity.dart';
 import 'package:analyzer/dart/ast/token.dart';
@@ skipping 413 matching lines @@
       _safelyVisit(node.documentationComment);
       _safelyVisitList(node.metadata);
       _safelyVisit(node.parameters);
       _safelyVisitList(node.initializers);
       _safelyVisit(node.body);
     });
   }
 
   @override
   visitDeclaredIdentifier(DeclaredIdentifier node) {
-    // variable
-    var variableVName = addNodeAndFacts(schema.VARIABLE_KIND,
-        element: node.element,
+    _handleVariableDeclaration(node.element, node.identifier,
         subKind: schema.LOCAL_SUBKIND,
-        completeFact: schema.DEFINITION);
-
-    // anchor
-    addAnchorEdgesContainingEdge(
-        syntacticEntity: node.identifier,
-        edges: [
-          schema.DEFINES_BINDING_EDGE,
-        ],
-        target: variableVName,
-        enclosingTarget: _enclosingVName);
-
-    // type
-    addEdge(
-        variableVName,
-        schema.TYPED_EDGE,
-        _vNameFromType(
-            resolutionMap.elementDeclaredByDeclaredIdentifier(node).type));
+        type: resolutionMap.elementDeclaredByDeclaredIdentifier(node).type);
 
     // no children
   }
 
   @override
   visitEnumConstantDeclaration(EnumConstantDeclaration node) {
     // constant node
     var constDeclVName =
         addNodeAndFacts(schema.CONSTANT_KIND, element: node.element);
 
@@ skipping 147 matching lines @@
   @override
   visitImportDirective(ImportDirective node) {
     // uri
     _handleUriReference(node.uri, node.uriElement);
 
     // prefix
     var prefixIdentifier = node.prefix;
 
     if (prefixIdentifier != null) {
       // variable
-      var variableVName = addNodeAndFacts(schema.VARIABLE_KIND,
-          element: prefixIdentifier.staticElement,
-          completeFact: schema.DEFINITION);
-
-      // anchor
-      addAnchorEdgesContainingEdge(
-          syntacticEntity: prefixIdentifier,
-          edges: [schema.DEFINES_BINDING_EDGE],
-          target: variableVName,
-          enclosingTarget: _enclosingVName);
+      _handleVariableDeclaration(
+          prefixIdentifier.staticElement, prefixIdentifier);
     }
 
     // visit children
     _safelyVisit(node.documentationComment);
     _safelyVisitList(node.metadata);
     _safelyVisitList(node.combinators);
     _safelyVisitList(node.configurations);
     _safelyVisit(node.uri);
   }
 
@@ skipping 216 matching lines @@
   @override
   visitUriBasedDirective(UriBasedDirective node) {
     _handleUriReference(node.uri, node.uriElement);
 
     // visit children
     super.visitUriBasedDirective(node);
   }
 
   @override
   visitVariableDeclaration(VariableDeclaration node) {
-    // level variable
     var isLocal = _enclosingVName != _enclosingClassVName &&
         _enclosingVName != _enclosingFileVName;
 
     // variable
-    var variableVName = addNodeAndFacts(schema.VARIABLE_KIND,
-        element: node.element,
+    _handleVariableDeclaration(node.element, node.name,
         subKind: isLocal ? schema.LOCAL_SUBKIND : schema.FIELD_SUBKIND,
-        completeFact: schema.DEFINITION);
-
-    // anchor
-    addAnchorEdgesContainingEdge(
-        syntacticEntity: node.name,
-        edges: [
-          schema.DEFINES_BINDING_EDGE,
-        ],
-        target: variableVName,
-        enclosingTarget: _enclosingVName);
-
-    // type
-    addEdge(
-        variableVName,
-        schema.TYPED_EDGE,
-        _vNameFromType(
-            resolutionMap.elementDeclaredByVariableDeclaration(node).type));
+        type: resolutionMap.elementDeclaredByVariableDeclaration(node).type);
 
     // visit children
     _safelyVisit(node.initializer);
   }
 
   Element _findNonSyntheticElement(Element element) {
     if (element == null || !element.isSynthetic) {
       return element;
     }
     if (element is PropertyAccessorElement) {
@@ skipping 121 matching lines @@
           edges: [schema.REF_EDGE],
           target: vName);
 
       // childof from the anchor
       addEdge(anchorVName, schema.CHILD_OF_EDGE, _enclosingVName);
     }
 
     // no children to visit
   }
 
+  void _handleVariableDeclaration(
+      Element element, SyntacticEntity syntacticEntity,
+      {String subKind, DartType type}) {
+    // variable
+    var variableVName = addNodeAndFacts(schema.VARIABLE_KIND,
+        element: element, subKind: subKind, completeFact: schema.DEFINITION);
+
+    // anchor
+    addAnchorEdgesContainingEdge(
+        syntacticEntity: syntacticEntity,
+        edges: [
+          schema.DEFINES_BINDING_EDGE,
+        ],
+        target: variableVName,
+        enclosingTarget: _enclosingVName);
+
+    // type
+    if (type != null) {
+      addEdge(variableVName, schema.TYPED_EDGE, _vNameFromType(type));
+    }
+  }
+
   /// Add a "ref/imports" edge from the passed [uriNode] location to the
   /// [referencedElement] [Element].  If the passed element is null, the edge is
   /// not written out.
   void _handleUriReference(StringLiteral uriNode, Element referencedElement) {
     if (referencedElement != null) {
       var start = uriNode.offset;
       var end = uriNode.end;
 
       // The following is the expected and common case.
       // The contents between the quotes is used as the location to work well
@@ skipping 371 matching lines @@
   }
 
   @override
   StringBuffer visitTypeParameterElement(TypeParameterElement e) {
     // It is legal to have a named constructor with the same name as a type
     // parameter.  So we distinguish them by using '.' between the class (or
     // typedef) name and the type parameter name.
     return e.enclosingElement.accept(this)..write('.')..write(e.name);
   }
 }