languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-18 20:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for SimpleFormalParameter exception in the Dart Kythe indexer.

Browse source 
Change-Id: Ibf0a8468bc154d97a7d2f84d2947aabc5e960ab7
Reviewed-on: https://dart-review.googlesource.com/18142
Reviewed-by: Jaime Wren <jwren@google.com>
Reviewed-by: Brian Wilkerson <brianwilkerson@google.com>
This commit is contained in:
Jaime Wren 2017-11-02 16:37:38 +00:00
parent c0f81029a3
commit f5904eae38
1 changed files with 41 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
pkg/analysis_server/lib/src/services/kythe/kythe_visitors.dart
View file

@ -740,43 +740,48 @@ class KytheDartVisitor extends GeneralizingAstVisitor with OutputUtils {
subKind: schema.LOCAL_PARAMETER_SUBKIND,
completeFact: schema.DEFINITION);
// The anchor and anchor edges generation are broken into two cases, the
// first case is "method(parameter_name) ...", where the the parameter
// character range only includes a parameter name. The second case is for
// parameter declarations which are prefixed with a type, 'var', or
// 'dynamic', as in "method(var parameter_name) ...".
//
// With the first case a single anchor range is created, for the second
// case an anchor is created on parameter_name, as well as the range
// including any prefixes.
if (node.offset == node.identifier.offset &&
node.length == node.identifier.length) {
// anchor- defines/binding, defines
addAnchorEdgesContainingEdge(
syntacticEntity: node.identifier,
edges: [
schema.DEFINES_BINDING_EDGE,
schema.DEFINES_EDGE,
],
target: paramVName,
enclosingTarget: _enclosingVName);
} else {
// anchor- defines/binding
addAnchorEdgesContainingEdge(
syntacticEntity: node.identifier,
edges: [
schema.DEFINES_BINDING_EDGE,
],
target: paramVName,
enclosingTarget: _enclosingVName);
// node.identifier can be null in cases with the new generic function type
// syntax
// TODO(jwren) add test cases for this situation
if (node.identifier != null) {
// The anchor and anchor edges generation are broken into two cases, the
// first case is "method(parameter_name) ...", where the the parameter
// character range only includes a parameter name. The second case is for
// parameter declarations which are prefixed with a type, 'var', or
// 'dynamic', as in "method(var parameter_name) ...".
//
// With the first case a single anchor range is created, for the second
// case an anchor is created on parameter_name, as well as the range
// including any prefixes.
if (node.offset == node.identifier.offset &&
node.length == node.identifier.length) {
// anchor- defines/binding, defines
addAnchorEdgesContainingEdge(
syntacticEntity: node.identifier,
edges: [
schema.DEFINES_BINDING_EDGE,
schema.DEFINES_EDGE,
],
target: paramVName,
enclosingTarget: _enclosingVName);
} else {
// anchor- defines/binding
addAnchorEdgesContainingEdge(
syntacticEntity: node.identifier,
edges: [
schema.DEFINES_BINDING_EDGE,
],
target: paramVName,
enclosingTarget: _enclosingVName);
// anchor- defines
addAnchorEdgesContainingEdge(
syntacticEntity: node,
edges: [
schema.DEFINES_EDGE,
],
target: paramVName);
// anchor- defines
addAnchorEdgesContainingEdge(
syntacticEntity: node,
edges: [
schema.DEFINES_EDGE,
],
target: paramVName);
}
}
// type