suggest catch and finally keywords

suggest catch and finally keywords

After a try block that does not have a "catch" block,
suggest the "catch" keyword and nothing else.
After a "catch" block, suggest the "finally" keyword.

Fix https://github.com/dart-lang/sdk/issues/27560

R=brianwilkerson@google.com

Committed: https://github.com/dart-lang/sdk/commit/02adcc961451f5c90760a41a7293c44f3784baf4

[danrubel, 2017-02-01 21:44:52]

danrubel@google.com changed reviewers:
+ brianwilkerson@google.com

[Brian Wilkerson, 2017-02-01 22:02:19]

https://codereview.chromium.org/2662973007/diff/1/pkg/analysis_server/lib/src...
File
pkg/analysis_server/lib/src/services/completion/dart/keyword_contributor.dart
(right):

https://codereview.chromium.org/2662973007/diff/1/pkg/analysis_server/lib/src...
pkg/analysis_server/lib/src/services/completion/dart/keyword_contributor.dart:102:
}
Hm. This logic seems slightly wrong.

try { ... }

suggest 'catch' and 'finally', but nothing else.

try { ... } catch ... { ... }

suggest finally or another statement.

try { ... } catch ... { ... } finally { ... }

or

try { ... } finally { ... }

suggest another statement

https://codereview.chromium.org/2662973007/diff/1/pkg/analysis_server/lib/src...
File pkg/analysis_server/lib/src/services/completion/dart/optype.dart (right):

https://codereview.chromium.org/2662973007/diff/1/pkg/analysis_server/lib/src...
pkg/analysis_server/lib/src/services/completion/dart/optype.dart:939: Statement
_getPreviousStatement(Block node, Object entity) {
Can we share the definitions of this method?

https://codereview.chromium.org/2662973007/diff/1/pkg/analysis_server/test/se...
File pkg/analysis_server/test/services/completion/dart/optype_test.dart (right):

https://codereview.chromium.org/2662973007/diff/1/pkg/analysis_server/test/se...
pkg/analysis_server/test/services/completion/dart/optype_test.dart:381: // Only
return 'catch' keyword
I think 'finally' is perfectly valid here.

[danrubel, 2017-02-04 20:13:42]

Updated to suggest on/catch/finally keywords as appropriate. PTAL.

https://codereview.chromium.org/2662973007/diff/1/pkg/analysis_server/lib/src...
File
pkg/analysis_server/lib/src/services/completion/dart/keyword_contributor.dart
(right):

https://codereview.chromium.org/2662973007/diff/1/pkg/analysis_server/lib/src...
pkg/analysis_server/lib/src/services/completion/dart/keyword_contributor.dart:102:
}
On 2017/02/01 22:02:18, Brian Wilkerson wrote:
> Hm. This logic seems slightly wrong.
> 
> try { ... }
> 
> suggest 'catch' and 'finally', but nothing else.
> 
> try { ... } catch ... { ... }
> 
> suggest finally or another statement.
> 
> try { ... } catch ... { ... } finally { ... }
> 
> or
> 
> try { ... } finally { ... }
> 
> suggest another statement

<facepalm/> I implemented the forms I commonly use, but forgot the others.
Fixed.

https://codereview.chromium.org/2662973007/diff/1/pkg/analysis_server/lib/src...
File pkg/analysis_server/lib/src/services/completion/dart/optype.dart (right):

https://codereview.chromium.org/2662973007/diff/1/pkg/analysis_server/lib/src...
pkg/analysis_server/lib/src/services/completion/dart/optype.dart:939: Statement
_getPreviousStatement(Block node, Object entity) {
On 2017/02/01 22:02:19, Brian Wilkerson wrote:
> Can we share the definitions of this method?

Good point. Done.

https://codereview.chromium.org/2662973007/diff/1/pkg/analysis_server/test/se...
File pkg/analysis_server/test/services/completion/dart/optype_test.dart (right):

https://codereview.chromium.org/2662973007/diff/1/pkg/analysis_server/test/se...
pkg/analysis_server/test/services/completion/dart/optype_test.dart:381: // Only
return 'catch' keyword
On 2017/02/01 22:02:19, Brian Wilkerson wrote:
> I think 'finally' is perfectly valid here.

Yup. Fixed.

[Brian Wilkerson, 2017-02-04 21:39:19]

lgtm

[danrubel, 2017-02-06 17:57:57]

Description was changed from

==========
suggest catch and finally keywords

After a try block that does not have a "catch" block,
suggest the "catch" keyword and nothing else.
After a "catch" block, suggest the "finally" keyword.

Fix https://github.com/dart-lang/sdk/issues/27560
==========

to

==========
suggest catch and finally keywords

After a try block that does not have a "catch" block,
suggest the "catch" keyword and nothing else.
After a "catch" block, suggest the "finally" keyword.

Fix https://github.com/dart-lang/sdk/issues/27560

R=brianwilkerson@google.com

Committed:
https://github.com/dart-lang/sdk/commit/02adcc961451f5c90760a41a7293c44f3784baf4
==========

[danrubel, 2017-02-06 17:57:58]

Committed patchset #7 (id:120001) manually as
02adcc961451f5c90760a41a7293c44f3784baf4 (presubmit successful).