diff --git a/dist/main/atom/autoCompleteProvider.js b/dist/main/atom/autoCompleteProvider.js index cc9d64f5e..823b5c583 100644 --- a/dist/main/atom/autoCompleteProvider.js +++ b/dist/main/atom/autoCompleteProvider.js @@ -115,10 +115,11 @@ exports.provider = { if (options.suggestion.atomTS_IsImport) { options.editor.moveToBeginningOfLine(); options.editor.selectToEndOfLine(); - var groups = /^\s*import\s*(\w*)\s*=\s*require\s*\(\s*(["'])/.exec(options.editor.getSelectedText()); - var alias = groups[1]; - quote = quote || groups[2]; - options.editor.replaceSelectedText(null, function () { return "import " + alias + " = require(" + quote + options.suggestion.atomTS_IsImport.relativePath + quote + ");"; }); + var groups = /^(\s*)import\s*(\w*)\s*=\s*require\s*\(\s*(["'])/.exec(options.editor.getSelectedText()); + var leadingWhiteSpace = groups[1]; + var alias = groups[2]; + quote = quote || groups[3]; + options.editor.replaceSelectedText(null, function () { return leadingWhiteSpace + "import " + alias + " = require(" + quote + options.suggestion.atomTS_IsImport.relativePath + quote + ");"; }); } if (options.suggestion.atomTS_IsES6Import) { var row = options.editor.getCursorBufferPosition().row; diff --git a/lib/main/atom/autoCompleteProvider.ts b/lib/main/atom/autoCompleteProvider.ts index 7bd27fc4b..d6ab9c6cf 100644 --- a/lib/main/atom/autoCompleteProvider.ts +++ b/lib/main/atom/autoCompleteProvider.ts @@ -214,13 +214,14 @@ export var provider: autocompleteplus.Provider = { if (options.suggestion.atomTS_IsImport) { options.editor.moveToBeginningOfLine(); options.editor.selectToEndOfLine(); - var groups = /^\s*import\s*(\w*)\s*=\s*require\s*\(\s*(["'])/.exec(options.editor.getSelectedText()); - var alias = groups[1]; + var groups = /^(\s*)import\s*(\w*)\s*=\s*require\s*\(\s*(["'])/.exec(options.editor.getSelectedText()); + var leadingWhiteSpace = groups[1]; + var alias = groups[2]; // Use the option if they have a preferred. Otherwise preserve - quote = quote || groups[2]; - - options.editor.replaceSelectedText(null, function() { return `import ${alias} = require(${quote}${options.suggestion.atomTS_IsImport.relativePath}${quote});`; }); + quote = quote || groups[3]; + + options.editor.replaceSelectedText(null, function() { return `${leadingWhiteSpace}import ${alias} = require(${quote}${options.suggestion.atomTS_IsImport.relativePath}${quote});`; }); } if (options.suggestion.atomTS_IsES6Import) { var {row} = options.editor.getCursorBufferPosition();