Fix the Dart formatter

Fix the Dart formatter
This cl addresses fixing tests 001 and 002.
Other cl's will be created for continue to fix the formatter.
Committed: https://code.google.com/p/dart/source/detail?r=2502

[Mark R Russell, 2011-12-15 22:09:16]

Here a the first of many CL's to fix and add new language features to the
formatter.

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
File
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/indexer/location/DartElementLocationImpl.java
(right):

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/indexer/location/DartElementLocationImpl.java:2:
* Copyright (c) 2011, the Dart project authors.
This code was reformatted by my Eclipse settings.  I can try to unformat it if
that is an issue.

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
File
editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/formatter/testsource/test002$A_in.dart
(right):

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/formatter/testsource/test002$A_in.dart:6:
class Test002def {int a(b, c) {}}
I fixed this because it was not valid Dart syntax

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
File
editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/formatter/testsource/test002$A_out.dart
(right):

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/formatter/testsource/test002$A_out.dart:16:
int a(b, c) {
This myst match the input

[messick, 2011-12-15 22:34:06]

Please restore the formatting of Scribe so I can see what has changed.

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
File
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/formatter/CodeFormatterVisitor.java
(right):

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/formatter/CodeFormatterVisitor.java:1273:
System.out.println("nextToken: " + scribe.scanner.peekNextToken());
Remember to remove debug code. (I will ignore all other cases and only mention
it here.)

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/formatter/CodeFormatterVisitor.java:1276:
scribe.printNextToken(Token.STRING, true);
Need an optional comma and string for prefix here.

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/formatter/CodeFormatterVisitor.java:1277:
scribe.printNextToken(Token.RPAREN);
Need to add a semicolon here.

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
File
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/formatter/Scanner.java
(right):

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/formatter/Scanner.java:50:
int start = begin; // - 1;
How confident are you that this change is correct?

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
File
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/formatter/Scribe.java
(left):

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/formatter/Scribe.java:2:
* Copyright (c) 2011, the Dart project authors.
Please re-save this file without re-formatting it. I can't tell what has
changed.

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
File
editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/formatter/testsource/test002$A_in.dart
(right):

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/formatter/testsource/test002$A_in.dart:6:
class Test002def {int a(b, c) {}}
The syntax has changed so that only optional parameters can have default values.
Before finishing we should have another test to format:
class Test002opt {int a([b=2,c=5]){}}

[Mark R Russell, 2011-12-16 01:39:56]

I cleaned up scribe and removed all of the debug code.

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
File
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/formatter/CodeFormatterVisitor.java
(right):

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/formatter/CodeFormatterVisitor.java:1273:
System.out.println("nextToken: " + scribe.scanner.peekNextToken());
On 2011/12/15 22:34:06, messick wrote:
> Remember to remove debug code. (I will ignore all other cases and only mention
> it here.)

Done.

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
File
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/formatter/Scanner.java
(right):

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
editor/tools/plugins/com.google.dart.tools.core/src/com/google/dart/tools/core/internal/formatter/Scanner.java:50:
int start = begin; // - 1;
I'll add some tests to validate this is correct.

On 2011/12/15 22:34:06, messick wrote:
> How confident are you that this change is correct?

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
File
editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/formatter/testsource/test002$A_in.dart
(right):

http://codereview.chromium.org/8966004/diff/1/editor/tools/plugins/com.google...
editor/tools/plugins/com.google.dart.tools.core_test/src/com/google/dart/tools/core/formatter/testsource/test002$A_in.dart:6:
class Test002def {int a(b, c) {}}
I'll add this to the test suite
On 2011/12/15 22:34:06, messick wrote:
> The syntax has changed so that only optional parameters can have default
values.
> Before finishing we should have another test to format:
> class Test002opt {int a([b=2,c=5]){}}

[Mark R Russell, 2011-12-16 02:09:17]

Per our conversation I dropped scanner.java out of this CL.  I am going to
rework scanner in another CL to make it better handle comments.

[Mark R Russell, 2011-12-16 02:09:53]

I did not drop scanner I dropped scribe.java

[messick, 2011-12-16 02:12:39]

lgtm

[Mark R Russell, 2011-12-16 02:14:32]

Thanks I'll commit it