mrva/vscode-codeql
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Fix running tests when ms-python is installed. (#803)

Browse Source 
Co-authored-by: Aditya Sharad <6874315+adityasharad@users.noreply.github.com>
This commit is contained in:
Alexander Eyers-Taylor
2021-03-22 23:54:02 +00:00
committed by GitHub
parent 8c2db75886
commit d909f98fcb
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
extensions/ql-vscode/src/cli.ts
View File

@@ -906,6 +906,20 @@ class SplitBuffer {
this.buffer += this.separators[0]; // Append a separator to the end to ensure the last line is returned. this.buffer += this.separators[0]; // Append a separator to the end to ensure the last line is returned.
} }
/**
* A version of startsWith that isn't overriden by a broken version of ms-python.
*
* The definition comes from
* https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith
* which is CC0/public domain
*
* See https://github.com/github/vscode-codeql/issues/802 for more context as to why we need it.
*/
private static startsWith(s: string, searchString: string, position: number): boolean {
const pos = position > 0 ? position | 0 : 0;
return s.substring(pos, pos + searchString.length) === searchString;
}
/** /**
* Extract the next full line from the buffer, if one is available. * Extract the next full line from the buffer, if one is available.
* @returns The text of the next available full line (without the separator), or `undefined` if no * @returns The text of the next available full line (without the separator), or `undefined` if no
@@ -914,7 +928,7 @@ class SplitBuffer {
public getNextLine(): string | undefined { public getNextLine(): string | undefined {
while (this.searchIndex <= (this.buffer.length - this.maxSeparatorLength)) { while (this.searchIndex <= (this.buffer.length - this.maxSeparatorLength)) {
for (const separator of this.separators) { for (const separator of this.separators) {
if (this.buffer.startsWith(separator, this.searchIndex)) { if (SplitBuffer.startsWith(this.buffer, separator, this.searchIndex)) {
const line = this.buffer.substr(0, this.searchIndex); const line = this.buffer.substr(0, this.searchIndex);
this.buffer = this.buffer.substr(this.searchIndex + separator.length); this.buffer = this.buffer.substr(this.searchIndex + separator.length);
this.searchIndex = 0; this.searchIndex = 0;