fix #104698 Make query element of uri survive conflict resolution massaging (#104699)

gjsjohnmurray · web-flow · commit 04f2a740c7ea · 2020-08-17T15:12:26.000+02:00
* fix #104698 Make query element of uri survive conflict resolution massaging * Incorporate PR feedback * Simplify * Event simpler, and with comments * Variant preferred by @bpasero
diff --git 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<ITextModel> {

Original file line number	Diff line number	Diff line change
`@@ -164,11 +164,12 @@ export class TextFileContentProvider extends Disposable implements ITextModelCon`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`private static resourceToTextFile(scheme: string, resource: URI): URI {`
`167`		`- return resource.with({ scheme, query: JSON.stringify({ scheme: resource.scheme }) });`
	`167`	`+ return resource.with({ scheme, query: JSON.stringify({ scheme: resource.scheme, query: resource.query }) });`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`private static textFileToResource(resource: URI): URI {`
`171`		`- return resource.with({ scheme: JSON.parse(resource.query)['scheme'], query: null });`
	`171`	`+ const { scheme, query } = JSON.parse(resource.query);`
	`172`	`+ return resource.with({ scheme, query });`
`172`	`173`	`}`
`173`	`174`
`174`	`175`	`async provideTextContent(resource: URI): Promise<ITextModel> {`