Skip to content

Make live reload script injection more reliable. #746

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

Open
DominoPivot wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make live reload script injection more reliable. #746

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
38 changes: 18 additions & 20 deletions src/server/serverUtils/contentLoader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ interface IIndexDirEntry {
export class ContentLoader extends Disposable {
private _scriptInjector: HTMLInjector | undefined;
private _servedFiles: Set<string> = new Set<string>();
private _insertionTags = ['head', 'body', 'html', '!DOCTYPE'];

constructor(
_extensionUri: vscode.Uri,
Expand Down Expand Up @@ -345,29 +344,28 @@ export class ContentLoader extends Disposable {
* @returns {string} the injected string.
*/
private _injectIntoFile(contents: string): string {
// order of preference for script placement:
// 1. after <head>
// 2. after <body>
// 3. after <html>
// 4. after <!DOCTYPE >
// 5. at the very beginning

let re: RegExp;
let tagEnd = 0;
for (const tag of this._insertionTags) {
re = new RegExp(`<${tag}[^>]*>`, 'g');
re.test(contents);

tagEnd = re.lastIndex;
if (tagEnd != 0) {
break;
let offset = 0;
const consume = (rx: RegExp): void => {
rx.lastIndex = offset;
if (rx.test(contents)) {
offset = rx.lastIndex;
}
}
};

// whitespace, comments, and xml processor instructions
const misc = /(?:\s+|<!--.*?-->|<\?[^>]*>)*/sy;

consume(misc);
consume(/<!DOCTYPE\s[^>]*>/iy);
consume(misc);
consume(/<html(?:\s[^>]*)?>/iy);
consume(misc);
consume(/<(?:head|body)(?:\s[^>]*)?>/iy);

const newContents =
contents.substring(0, tagEnd) +
contents.substring(0, offset) +
this._scriptInjection +
contents.substring(tagEnd);
contents.substring(offset);
return newContents;
}

Expand Down