Skip to content

Commit f6a76b2

Browse files
committed
updates from pr feedback
1 parent e0f5e99 commit f6a76b2

File tree

2 files changed

+17
-11
lines changed

2 files changed

+17
-11
lines changed

app/exec/extension/_lib/vsix-manifest-builder.ts

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -798,13 +798,15 @@ export class VsixManifestBuilder extends ManifestBuilder {
798798
Object.keys(this.files).forEach(filePath => {
799799
if (this.files[filePath].contentType) {
800800
let partName = "/" + toZipItemName(this.files[filePath].partName);
801-
contentTypes.Types.Override.push({
802-
$: {
803-
ContentType: this.files[filePath].contentType,
804-
PartName: partName,
805-
},
806-
});
807-
seenPartNames.add(partName);
801+
if (!seenPartNames.has(partName)) {
802+
contentTypes.Types.Override.push({
803+
$: {
804+
ContentType: this.files[filePath].contentType,
805+
PartName: partName,
806+
},
807+
});
808+
seenPartNames.add(partName);
809+
}
808810
if ((this.files[filePath] as any)._additionalPackagePaths) {
809811
for (const additionalPath of (this.files[filePath] as any)._additionalPackagePaths) {
810812
let additionalPartName = "/" + toZipItemName(additionalPath);

app/exec/extension/_lib/vsix-writer.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,10 @@ export class VsixWriter {
184184
if (itemName.indexOf(" "))
185185
if (!builder.files[path].content) {
186186
let readFilePromise = promisify(readFile)(path).then(result => {
187-
vsix.file(itemName, result);
188-
seenPartNames.add(itemName);
187+
if (!seenPartNames.has(itemName)) {
188+
vsix.file(itemName, result);
189+
seenPartNames.add(itemName);
190+
}
189191
if ((builder.files[path] as any)._additionalPackagePaths) {
190192
for (const p of (builder.files[path] as any)._additionalPackagePaths) {
191193
let additionalItemName = toZipItemName(p);
@@ -198,8 +200,10 @@ export class VsixWriter {
198200
});
199201
readFilePromises.push(readFilePromise);
200202
} else {
201-
vsix.file(itemName, builder.files[path].content);
202-
seenPartNames.add(itemName);
203+
if (!seenPartNames.has(itemName)) {
204+
vsix.file(itemName, builder.files[path].content);
205+
seenPartNames.add(itemName);
206+
}
203207
if ((builder.files[path] as any)._additionalPackagePaths) {
204208
for (const p of (builder.files[path] as any)._additionalPackagePaths) {
205209
let additionalItemName = toZipItemName(p);

0 commit comments

Comments
 (0)