Addition of the new flag "file-read-mode" into the analysis server to fix the offset bug with Intel…

pkg/analyzer/lib/file_system/physical_file_system.dart

 // Copyright (c) 2014, 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.
 
 library physical_file_system;
 
 import 'dart:async';
 import 'dart:io' as io;
 
 import 'package:analyzer/src/generated/java_io.dart';
 import 'package:analyzer/src/generated/source_io.dart';
 import 'package:path/path.dart';
 import 'package:watcher/watcher.dart';
 
 import 'file_system.dart';
 
 
 /**
  * A `dart:io` based implementation of [ResourceProvider].
  */
 class PhysicalResourceProvider implements ResourceProvider {
+
+  static final NORMALIZE_EOL_MODE =

[Brian Wilkerson, 2015/01/20 18:56:14]

Unless I missed something, there doesn't appear to be a test for this function.

[jwren, 2015/01/20 21:38:14]

Done.

+      (String string) => string.replaceAll('\r\n', '\n');

[Paul Berry, 2015/01/20 19:10:53]

Based on previous email discussions, I believe there is an additional behavior
we need: any '\r' *not* followed by '\n' needs to be converted into '\n'.

[jwren, 2015/01/20 21:38:14]

Done.  As we discussed, I remembered this but left it out.  Including the \r
->\n now.

+
   static final PhysicalResourceProvider INSTANCE =
-      new PhysicalResourceProvider._();
+      new PhysicalResourceProvider._(null);
+
+  static final PhysicalResourceProvider INSTANCE_NORMALIZE_EOL =
+      new PhysicalResourceProvider._(NORMALIZE_EOL_MODE);
 
   /**
    * The name of the directory containing plugin specific subfolders used to
    * store data across sessions.
    */
   static final String SERVER_DIR = ".dartServer";
 
-  PhysicalResourceProvider._();
+  PhysicalResourceProvider._(String fileReadMode(String s)) {

[Paul Berry, 2015/01/20 19:10:53]

Rather than having a private constructor and two instances (which limits all
analyzer clients to just the two file read modes) consider making this
constructor public and allow the analyzer client to specify the conversion
function.  We could still provide a static instance for the convenience of
clients that just want the as-is behavior (e.g. tests), but clients that wanted
to specify their own file read behavior would do so by constructing a
PhysicalResourceProvider and passing in a function.

This would have the advantage that in the future when we need to add additional
file read modes, we would only have to change analysis server; we would not need
to rev analyzer to support the new mode.

[jwren, 2015/01/20 21:38:14]

Done.

+    if(fileReadMode != null) {
+      FileBasedSource.fileReadMode = fileReadMode;
+    }
+  }
 
   @override
   Context get pathContext => io.Platform.isWindows ? windows : posix;
 
   @override
   Resource getResource(String path) {
     if (io.FileSystemEntity.isDirectorySync(path)) {
       io.Directory directory = new io.Directory(path);
       return new _PhysicalFolder(directory);
     } else {
@@ skipping 129 matching lines @@
   bool operator ==(other) {
     if (runtimeType != other.runtimeType) {
       return false;
     }
     return path == other.path;
   }
 
   @override
   String toString() => path;
 }