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

pkg/analysis_server/lib/src/server/driver.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 driver;
 
 import 'dart:async';
 import 'dart:io';
 
 import 'package:analysis_server/plugin/plugin.dart';
@@ skipping 97 matching lines @@
   static const String PORT_OPTION = "port";
 
   /**
    * The path to the SDK.
    * TODO(paulberry): get rid of this once the 'analysis.updateSdks' request is
    * operational.
    */
   static const String SDK_OPTION = "sdk";
 
   /**
-   * The name of the option used to disable error notifications.
+   * The name of the flag used to disable error notifications.
    */
   static const String NO_ERROR_NOTIFICATION = "no-error-notification";
 
   /**
+   * The name of the option used to set the file read mode.
+   */
+  static const String FILE_READ_MODE = "file-read-mode";
+
+  /**
    * The instrumentation server that is to be used by the analysis server.
    */
   InstrumentationServer instrumentationServer;
 
   /**
    * The plugins that are defined outside the analysis_server package.
    */
   List<Plugin> _userDefinedPlugins = <Plugin>[];
 
   SocketServer socketServer;
@@ skipping 54 matching lines @@
         return;
       }
     }
 
     AnalysisServerOptions analysisServerOptions = new AnalysisServerOptions();
     analysisServerOptions.enableIncrementalResolutionApi =
         results[ENABLE_INCREMENTAL_RESOLUTION_API];
     analysisServerOptions.enableIncrementalResolutionValidation =
         results[INCREMENTAL_RESOLUTION_VALIDATION];
     analysisServerOptions.noErrorNotification = results[NO_ERROR_NOTIFICATION];
+    analysisServerOptions.fileReadMode = results[FILE_READ_MODE];
 
     _initIncrementalLogger(results[INCREMENTAL_RESOLUTION_LOG]);
 
     DartSdk defaultSdk;
     if (results[SDK_OPTION] != null) {
       defaultSdk = new DirectoryBasedDartSdk(new JavaFile(results[SDK_OPTION]));
     } else {
       // No path to the SDK provided; use DirectoryBasedDartSdk.defaultSdk,
       // which will make a guess.
       defaultSdk = DirectoryBasedDartSdk.defaultSdk;
@@ skipping 98 matching lines @@
         INTERNAL_PRINT_TO_CONSOLE,
         help: "enable sending `print` output to the console",
         defaultsTo: false,
         negatable: false);
     parser.addOption(
         PORT_OPTION,
         help: "[port] the port on which the server will listen");
     parser.addOption(SDK_OPTION, help: "[path] the path to the sdk");
     parser.addFlag(
         NO_ERROR_NOTIFICATION,
-        help:
-            "disable sending all analysis error notifications to the server",
+        help: "disable sending all analysis error notifications to the server",
         defaultsTo: false,
         negatable: false);
+    parser.addOption(
+        FILE_READ_MODE,
+        help: "an option of the ways files can be read from disk, " +
+            "some clients normalize end of line characters which would make " +
+            "the file offset and range information incorrect.",
+        allowed: ["as-is", "normalize-eol"],
+        allowedHelp: {
+      "as-is": "file contents are read as-is, no file changes occur",
+      "normalize-eol":
+          "file contents normalize the end of line characters to the single character new line `\n`"
+    }, defaultsTo: "as-is");
 
     return parser;
   }
 
   /**
    * Print information about how to use the server.
    */
   void _printUsage(ArgParser parser) {
     print('Usage: $BINARY_NAME [flags]');
     print('');
     print('Supported flags are:');
     print(parser.usage);
   }
 }