Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-26 18:06:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* fix #104698 Make query element of uri survive conflict resolution massaging

* Incorporate PR feedback

* Simplify

* Event simpler, and with comments

* Variant preferred by @bpasero
This commit is contained in:
John Murray
2020-08-17 15:12:26 +02:00
committed by GitHub
parent 6344d2f62c
commit 04f2a740c7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/files/common/files.ts
+3 -2
View File
@@ -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> {