Skip to content

fix(@angular-devkit/schematics): fix generate mangling files contai… #11978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexeagle merged 1 commit into from
Sep 6, 2018
Merged

fix(@angular-devkit/schematics): fix generate mangling files contai… #11978

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/angular_devkit/schematics/src/tree/recorder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@ export class UpdateRecorderBase implements UpdateRecorder {
if (c0 == 0xEF && c1 == 0xBB && c2 == 0xBF) {
return new UpdateRecorderBom(entry);
} else if (c0 === 0xFF && c1 == 0xFE) {
return new UpdateRecorderBom(entry, 2);
return new UpdateRecorderBom(entry);
} else if (c0 === 0xFE && c1 == 0xFF) {
return new UpdateRecorderBom(entry, 2);
return new UpdateRecorderBom(entry);
}

return new UpdateRecorderBase(entry);
Expand Down Expand Up @@ -70,7 +70,7 @@ export class UpdateRecorderBase implements UpdateRecorder {


export class UpdateRecorderBom extends UpdateRecorderBase {
constructor(entry: FileEntry, private _delta = 3) {
constructor(entry: FileEntry, private _delta = 1) {
super(entry);
}

Expand Down
20 changes: 16 additions & 4 deletions packages/angular_devkit/schematics/src/utility/update-buffer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,19 +201,31 @@ export class UpdateBuffer {
}

protected _slice(start: number): [Chunk, Chunk] {
this._assertIndex(start);
// If start is longer than the content, use start, otherwise determine exact position in string.
const index = start >= this._originalContent.length ? start : this._getTextPosition(start);

this._assertIndex(index);

// Find the chunk by going through the list.
const h = this._linkedList.find(chunk => start <= chunk.end);
const h = this._linkedList.find(chunk => index <= chunk.end);
if (!h) {
throw Error('Chunk cannot be found.');
}

if (start == h.end && h.next !== null) {
if (index == h.end && h.next !== null) {
return [h, h.next];
}

return [h, h.slice(start)];
return [h, h.slice(index)];
}

/**
* Gets the position in the content based on the position in the string.
* Some characters might be wider than one byte, thus we have to determine the position using
* string functions.
*/
protected _getTextPosition(index: number): number {
return Buffer.from(this._originalContent.toString().substring(0, index)).length;
}

get length(): number {
Expand Down
10 changes: 10 additions & 0 deletions packages/angular_devkit/schematics/src/utility/update-buffer_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,16 @@ describe('UpdateBuffer', () => {
mb.insertLeft(6, Buffer.from('Awesome '));
expect(mb.toString()).toBe('Hello Great Awesome Beautiful World');
});

it('works with special characters', () => {
const mb = new UpdateBuffer(Buffer.from('Ülaut'));

mb.insertLeft(1, Buffer.from('m'));
expect(mb.toString()).toBe('Ümlaut');

mb.insertLeft(0, Buffer.from('Hello '));
expect(mb.toString()).toBe('Hello Ümlaut');
});
});

describe('delete', () => {
Expand Down