Move encoding to common for #79275#100539
Move encoding to common for #79275#100539bpasero merged 9 commits intomicrosoft:masterfrom gyzerok:move-encoding-to-common
Conversation
src/vs/workbench/services/textfile/browser/browserTextFileService.ts
Outdated
Show resolved
Hide resolved
|
@gyzerok left some comments inside.
I think
I think we should probably move |
|
@bpasero as you mention in the issue thread we can just change signatures to expose
Should I proceed with it? |
|
Yeah sounds good 👍 |
|
@gyzerok looks like merge conflicts, let me know once I should review again |
|
Yeah, sure. I am waiting on the last piece aadsm/jschardet#58 |
|
@gyzerok I believe Alternatively we might have to fork it as |
|
@bpasero yes, applying One question still I want to double check with you - should the tests for |
If |
|
@bpasero all done now. It looks like tests stopped working locally due to some changes in master. |
|
@gyzerok this typically means you should do a round of The changes look pretty good to me, only thing I noticed is that the encoding tests should live inside the |
|
I think there is also a compile error here: |
|
@bpasero yeah, noticed. Sorry for that. Now it's under node as it should. |
|
And compilation error fixed as well. Sometimes |
|
@gyzerok great, one thing I noticed is that you added the modules to |
|
@bpasero are you talking about https://github.com/microsoft/vscode/pull/100539/files#diff-83d3bfc25cd4ba539f4d26e3047d7b1bR26-R27 or am I missing something else? |
|
Github seems to scroll past the line when going to the link here is the one to the file change: https://github.com/microsoft/vscode/pull/100539/files#diff-83d3bfc25cd4ba539f4d26e3047d7b1b |
|
@gyzerok yeah so self.require = {
baseUrl: `${window.location.origin}/static/out`,
paths: {
'vscode-textmate': `${window.location.origin}/static/node_modules/vscode-textmate/release/main`,
'vscode-oniguruma': `${window.location.origin}/static/node_modules/vscode-oniguruma/release/main`,
'xterm': `${window.location.origin}/static/node_modules/xterm/lib/xterm.js`,
'xterm-addon-search': `${window.location.origin}/static/node_modules/xterm-addon-search/lib/xterm-addon-search.js`,
'xterm-addon-unicode11': `${window.location.origin}/static/node_modules/xterm-addon-unicode11/lib/xterm-addon-unicode11.js`,
'xterm-addon-webgl': `${window.location.origin}/static/node_modules/xterm-addon-webgl/lib/xterm-addon-webgl.js`,
'semver-umd': `${window.location.origin}/static/node_modules/semver-umd/lib/semver-umd.js`,
'iconv-lite-umd': `${window.location.origin}/static/node_modules/iconv-lite-umd/lib/iconv-lite-umd.js`,
'jschardet': `${window.location.origin}/static/node_modules/jschardet/dist/jschardet.min.js`,
}
}; |
|
@bpasero trueee. Fixed it as well. Good think you are checking. Seems like I am missing some small but crucial details all the time. Hopefully it will wear off, after I learn vscode codebase a bit more :) Also your solution for tests worked like a charm. Thank you! 👍 |
|
Great stuff, merged. I will trigger a build to do some more testing, feel free to go ahead with the next part of enabling this for web and pushing down the encoding handling to the abstract textfileservice. |
Next PR in the series. Super excited that we are moving forward! 😄
I was thinking if I should move
encodingtocommonorbrowser. According to your wiki, to go to browser modules have to use some browser-specific APIs, which as I understand it is not the case here.What would be the best way to fix Monaco build errors?
It would probably make sense to merge #100541 first.