fix merge conflicts

microsoft · May 29, 2020 · ca58c0e · ca58c0e
1 parent a86a2fa
commit ca58c0e
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/services/codefixes/generateAccessors.ts b/src/services/codefixes/generateAccessors.ts
@@ -104,12 +104,13 @@ namespace ts.codefix {
  return modifierFlags;
  }
 
- export function getAccessorConvertiblePropertyAtPosition(file: SourceFile, start: number, end: number): Info | undefined {
+ export function getAccessorConvertiblePropertyAtPosition(file: SourceFile, start: number, end: number, userRequested = true): Info | undefined {
  const node = getTokenAtPosition(file, start);
+ const cursorRequest = start === end && userRequested;
  const declaration = findAncestor(node.parent, isAcceptedDeclaration);
  // make sure declaration have AccessibilityModifier or Static Modifier or Readonly Modifier
  const meaning = ModifierFlags.AccessibilityModifier | ModifierFlags.Static | ModifierFlags.Readonly;
- if (!declaration || !nodeOverlapsWithStartEnd(declaration.name, file, start, end)
+ if (!declaration || !(nodeOverlapsWithStartEnd(declaration.name, file, start, end) || cursorRequest)
  || !isConvertibleName(declaration.name) || (getEffectiveModifierFlags(declaration) | meaning) !== meaning) return undefined;
 
  const name = declaration.name.text;

diff --git a/src/services/refactors/convertExport.ts b/src/services/refactors/convertExport.ts
@@ -32,7 +32,7 @@ namespace ts.refactor {
  const span = getRefactorContextSpan(context);
  const token = getTokenAtPosition(file, span.start);
  const cursorRequest = userRequested && span;
- const exportNode = !!(getModifierFlags(token.parent) & ModifierFlags.Export) && cursorRequest ? token.parent : getParentNodeInSpan(token, file, span);
+ const exportNode = !!(getSyntacticModifierFlags(token.parent) & ModifierFlags.Export) && cursorRequest ? token.parent : getParentNodeInSpan(token, file, span);
  if (!exportNode || (!isSourceFile(exportNode.parent) && !(isModuleBlock(exportNode.parent) && isAmbientModule(exportNode.parent.parent)))) {
  return undefined;
  }

diff --git a/src/services/refactors/generateGetAccessorAndSetAccessor.ts b/src/services/refactors/generateGetAccessorAndSetAccessor.ts
@@ -19,7 +19,7 @@ namespace ts.refactor.generateGetAccessorAndSetAccessor {
  },
  getAvailableActions(context: RefactorContext): readonly ApplicableRefactorInfo[] {
  if (!context.endPosition) return emptyArray;
- if (!codefix.getAccessorConvertiblePropertyAtPosition(context.file, context.startPosition, context.endPosition)) return emptyArray;
+ if (!codefix.getAccessorConvertiblePropertyAtPosition(context.file, context.startPosition, context.endPosition, context.triggerReason === "invoked")) return emptyArray;
 
  return [{
  name: actionName,