From 04f2a740c7ea3eab0b2c8de1805145bd69be8dff Mon Sep 17 00:00:00 2001 From: John Murray Date: Mon, 17 Aug 2020 14:12:26 +0100 Subject: [PATCH] fix #104698 Make query element of uri survive conflict resolution massaging (#104699) * fix #104698 Make query element of uri survive conflict resolution massaging * Incorporate PR feedback * Simplify * Event simpler, and with comments * Variant preferred by @bpasero --- src/vs/workbench/contrib/files/common/files.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/vs/workbench/contrib/files/common/files.ts b/src/vs/workbench/contrib/files/common/files.ts index 3fe4953a5c6..a6ec9ed423f 100644 --- a/src/vs/workbench/contrib/files/common/files.ts +++ b/src/vs/workbench/contrib/files/common/files.ts @@ -164,11 +164,12 @@ export class TextFileContentProvider extends Disposable implements ITextModelCon } private static resourceToTextFile(scheme: string, resource: URI): URI { - return resource.with({ scheme, query: JSON.stringify({ scheme: resource.scheme }) }); + return resource.with({ scheme, query: JSON.stringify({ scheme: resource.scheme, query: resource.query }) }); } private static textFileToResource(resource: URI): URI { - return resource.with({ scheme: JSON.parse(resource.query)['scheme'], query: null }); + const { scheme, query } = JSON.parse(resource.query); + return resource.with({ scheme, query }); } async provideTextContent(resource: URI): Promise {