maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Handle shebang in import code fix (#20306)

Browse source
This commit is contained in:
Andy 2017-11-28 15:41:59 -05:00 committed by GitHub
parent bbb56fed11
commit cb5fd53731
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/services/utilities.ts
View file

@ -1329,13 +1329,17 @@ namespace ts {
return getTokenAtPosition(sourceFile, declaration.members.pos - 1, /*includeJsDocComment*/ false);
}
export function getSourceFileImportLocation(node: SourceFile) {
// For a source file, it is possible there are detached comments we should not skip
const text = node.text;
const textLength = text.length;
let ranges = getLeadingCommentRanges(text, 0);
if (!ranges) return 0;
export function getSourceFileImportLocation({ text }: SourceFile) {
const shebang = getShebang(text);
let position = 0;
if (shebang !== undefined) {
position = shebang.length;
advancePastLineBreak();
}
// For a source file, it is possible there are detached comments we should not skip
let ranges = getLeadingCommentRanges(text, position);
if (!ranges) return position;
// However we should still skip a pinned comment at the top
if (ranges.length && ranges[0].kind === SyntaxKind.MultiLineCommentTrivia && isPinnedComment(text, ranges[0])) {
position = ranges[0].end;
@ -1344,7 +1348,7 @@ namespace ts {
}
// As well as any triple slash references
for (const range of ranges) {
if (range.kind === SyntaxKind.SingleLineCommentTrivia && isRecognizedTripleSlashComment(node.text, range.pos, range.end)) {
if (range.kind === SyntaxKind.SingleLineCommentTrivia && isRecognizedTripleSlashComment(text, range.pos, range.end)) {
position = range.end;
advancePastLineBreak();
continue;
@ -1354,12 +1358,12 @@ namespace ts {
return position;
function advancePastLineBreak() {
if (position < textLength) {
if (position < text.length) {
const charCode = text.charCodeAt(position);
if (isLineBreak(charCode)) {
position++;
if (position < textLength && charCode === CharacterCodes.carriageReturn && text.charCodeAt(position) === CharacterCodes.lineFeed) {
if (position < text.length && charCode === CharacterCodes.carriageReturn && text.charCodeAt(position) === CharacterCodes.lineFeed) {
position++;
}
}

18
tests/cases/fourslash/importNameCodeFixShebang.ts Normal file
View file

@ -0,0 +1,18 @@
/// <reference path="fourslash.ts" />
// @Filename: /a.ts
////export const foo = 0;
// @Filename: /b.ts
////[|#!/usr/bin/env node
////foo/**/|]
goTo.file("/a.ts");
goTo.file("/b.ts");
verify.importFixAtPosition([
`#!/usr/bin/env node
import { foo } from "./a";
foo`,
]);