development/vscode
development/vscode
1
0
Fork 0
mirror of https://github.com/Microsoft/vscode synced 2024-10-05 19:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Git - Fix GitConfigParser regression (#167309)

Browse source 
Fix #166264
This commit is contained in:
Ladislau Szomoru 2022-11-28 07:01:40 +01:00 committed by GitHub
parent ac084d723b
commit 075f04bf39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
extensions/git/src/git.ts
View file

@ -709,7 +709,7 @@ interface GitConfigSection {
}
class GitConfigParser {
private static readonly _lineSeparator = /\r?\n/g;
private static readonly _lineSeparator = /\r?\n/;
private static readonly _propertyRegex = /^\s*(\w+)\s*=\s*(.*)$/;
private static readonly _sectionRegex = /^\s*\[\s*([^\]]+?)\s*(\"[^"]+\")*\]\s*$/;
@ -723,13 +723,8 @@ class GitConfigParser {
config.sections.push(section);
};
let position = 0;
let match: RegExpExecArray | null = null;
while (match = GitConfigParser._lineSeparator.exec(raw)) {
const line = raw.substring(position, match.index);
position = match.index + match[0].length;
for (const line of raw.split(GitConfigParser._lineSeparator)) {
// Section
const sectionMatch = line.match(GitConfigParser._sectionRegex);
if (sectionMatch?.length === 3) {
addSection(section);
@ -738,7 +733,7 @@ class GitConfigParser {
continue;
}
// Properties
// Property
const propertyMatch = line.match(GitConfigParser._propertyRegex);
if (propertyMatch?.length === 3 && !Object.keys(section.properties).includes(propertyMatch[1])) {
section.properties[propertyMatch[1]] = propertyMatch[2];