Merge branch 'master' into services_settings

src/harness/fourslash.ts

@@ -2522,7 +2522,7 @@ Actual: ${stringify(fullActual)}`);
  * @param fileName Path to file where error should be retrieved from.
  */
  private getCodeFixes(fileName: string, errorCode?: number, options: ts.Options = ts.defaultOptions): ts.CodeFixAction[] {
- const diagnosticsForCodeFix = this.getDiagnostics(fileName).map(diagnostic => ({
+ const diagnosticsForCodeFix = this.getDiagnostics(fileName, /*includeSuggestions*/ true).map(diagnostic => ({
  start: diagnostic.start,
  length: diagnostic.length,
  code: diagnostic.code

src/server/protocol.ts

@@ -2645,6 +2645,7 @@ namespace ts.server.protocol {
  * For those entries, The `insertText` and `replacementSpan` properties will be set to change from `.x` property access to `["x"]`.
  */
  readonly includeCompletionsWithInsertText?: boolean;
+ readonly importModuleSpecifierPreference?: "relative" | "baseUrl";
  }
 
  export interface CompilerOptions {

src/services/codefixes/importFixes.ts

@@ -273,7 +273,7 @@ namespace ts.codefix {
  }
 
  const relativePath = removeExtensionAndIndexPostFix(getRelativePath(moduleFileName, sourceDirectory, getCanonicalFileName), compilerOptions, addJsExtension);
- if (!baseUrl || options.importModuleSpecifierPreference == "relative") {
+ if (!baseUrl || options.importModuleSpecifierPreference === "relative") {
  return [relativePath];
  }
 

src/services/shims.ts

@@ -925,7 +925,7 @@ namespace ts {
  return this.forwardJSONCall(
  `getCompletionEntryDetails('${fileName}', ${position}, '${entryName}')`,
  () => {
- const localOptions: ts.FormatCodeOptions = formatOptions === undefined ? undefined : JSON.parse(formatOptions);
+ const localOptions: FormatCodeOptions = formatOptions === undefined ? undefined : JSON.parse(formatOptions);
  return this.languageService.getCompletionEntryDetails(fileName, position, entryName, localOptions, source, options);
  }
  );

tests/baselines/reference/api/tsserverlibrary.d.ts

@@ -4069,6 +4069,7 @@ declare namespace ts {
  readonly quote?: "double" | "single";
  readonly includeCompletionsForModuleExports?: boolean;
  readonly includeCompletionsWithInsertText?: boolean;
+ readonly importModuleSpecifierPreference?: "relative" | "baseUrl";
  }
  interface LanguageService {
  cleanupSemanticCache(): void;
@@ -7110,6 +7111,7 @@ declare namespace ts.server.protocol {
  * For those entries, The `insertText` and `replacementSpan` properties will be set to change from `.x` property access to `["x"]`.
  */
  readonly includeCompletionsWithInsertText?: boolean;
+ readonly importModuleSpecifierPreference?: "relative" | "baseUrl";
  }
  interface CompilerOptions {
  allowJs?: boolean;
@@ -7901,7 +7903,7 @@ declare namespace ts.server {
  private updateProjectIfDirty(project);
  getFormatCodeOptions(file: NormalizedPath): FormatCodeSettings;
  getOptions(file: NormalizedPath): Options;
- private onSourceFileChanged(fileName, eventKind);
+ private onSourceFileChanged(fileName, eventKind, path);
  private handleDeletedFile(info);
  private onConfigChangedForConfiguredProject(project, eventKind);
  /**

tests/baselines/reference/api/typescript.d.ts

@@ -4321,6 +4321,7 @@ declare namespace ts {
  readonly quote?: "double" | "single";
  readonly includeCompletionsForModuleExports?: boolean;
  readonly includeCompletionsWithInsertText?: boolean;
+ readonly importModuleSpecifierPreference?: "relative" | "baseUrl";
  }
  interface LanguageService {
  cleanupSemanticCache(): void;