Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Encoding euckr does not exist anymore (fix #101847) #101853

Merged
merged 1 commit into from
Jul 7, 2020
Merged

Encoding euckr does not exist anymore (fix #101847) #101853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"gulp-bom": "^1.0.0",
"gulp-sourcemaps": "^1.11.0",
"gulp-uglify": "^3.0.0",
"iconv-lite-umd": "0.6.5",
"iconv-lite-umd": "0.6.6",
"mime": "^1.3.4",
"minimatch": "3.0.4",
"minimist": "^1.2.3",
Expand Down
8 changes: 4 additions & 4 deletions build/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1428,10 +1428,10 @@ https-proxy-agent@^4.0.0:
agent-base "5"
debug "4"

iconv-lite-umd@0.6.5:
version "0.6.5"
resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722"
integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg==
iconv-lite-umd@0.6.6:
version "0.6.6"
resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.6.tgz#d00c8a822a248066d22b1e90635d8506a469f357"
integrity sha512-I4CCm48Jh10a8ETkgqfu2RofZd9gIcQwAcEI2x9MjgvdrbKxk8DdGpyq3WB7064mJXBgGniZgWky435ropCpmw==

ignore@^5.1.1:
version "5.1.2"
Expand Down
2 changes: 1 addition & 1 deletion extensions/git/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1878,7 +1878,7 @@
"dependencies": {
"byline": "^5.0.0",
"file-type": "^7.2.0",
"iconv-lite-umd": "0.6.5",
"iconv-lite-umd": "0.6.6",
"jschardet": "2.1.1",
"vscode-extension-telemetry": "0.1.1",
"vscode-nls": "^4.0.0",
Expand Down
8 changes: 4 additions & 4 deletions extensions/git/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,10 +425,10 @@ https-proxy-agent@^2.2.1:
agent-base "^4.3.0"
debug "^3.1.0"

iconv-lite-umd@0.6.5:
version "0.6.5"
resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722"
integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg==
iconv-lite-umd@0.6.6:
version "0.6.6"
resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.6.tgz#d00c8a822a248066d22b1e90635d8506a469f357"
integrity sha512-I4CCm48Jh10a8ETkgqfu2RofZd9gIcQwAcEI2x9MjgvdrbKxk8DdGpyq3WB7064mJXBgGniZgWky435ropCpmw==

inflight@^1.0.4:
version "1.0.6"
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"graceful-fs": "4.2.3",
"http-proxy-agent": "^2.1.0",
"https-proxy-agent": "^2.2.3",
"iconv-lite-umd": "0.6.5",
"iconv-lite-umd": "0.6.6",
"jschardet": "2.1.1",
"keytar": "^5.5.0",
"minimist": "^1.2.5",
Expand Down
2 changes: 1 addition & 1 deletion remote/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"graceful-fs": "4.2.3",
"http-proxy-agent": "^2.1.0",
"https-proxy-agent": "^2.2.3",
"iconv-lite-umd": "0.6.5",
"iconv-lite-umd": "0.6.6",
"jschardet": "2.1.1",
"minimist": "^1.2.5",
"native-watchdog": "1.3.0",
Expand Down
2 changes: 1 addition & 1 deletion remote/web/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.0.0",
"dependencies": {
"semver-umd": "^5.5.7",
"iconv-lite-umd": "0.6.5",
"iconv-lite-umd": "0.6.6",
"jschardet": "2.1.1",
"vscode-oniguruma": "1.3.1",
"vscode-textmate": "5.2.0",
Expand Down
8 changes: 4 additions & 4 deletions remote/web/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# yarn lockfile v1


iconv-lite-umd@0.6.5:
version "0.6.5"
resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722"
integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg==
iconv-lite-umd@0.6.6:
version "0.6.6"
resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.6.tgz#d00c8a822a248066d22b1e90635d8506a469f357"
integrity sha512-I4CCm48Jh10a8ETkgqfu2RofZd9gIcQwAcEI2x9MjgvdrbKxk8DdGpyq3WB7064mJXBgGniZgWky435ropCpmw==

jschardet@2.1.1:
version "2.1.1"
Expand Down
8 changes: 4 additions & 4 deletions remote/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,10 +196,10 @@ https-proxy-agent@^4.0.0:
agent-base "5"
debug "4"

iconv-lite-umd@0.6.5:
version "0.6.5"
resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722"
integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg==
iconv-lite-umd@0.6.6:
version "0.6.6"
resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.6.tgz#d00c8a822a248066d22b1e90635d8506a469f357"
integrity sha512-I4CCm48Jh10a8ETkgqfu2RofZd9gIcQwAcEI2x9MjgvdrbKxk8DdGpyq3WB7064mJXBgGniZgWky435ropCpmw==

ip@^1.1.5:
version "1.1.5"
Expand Down
11 changes: 11 additions & 0 deletions src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import * as streams from 'vs/base/common/stream';
import * as iconv from 'iconv-lite-umd';
import { getPathFromAmdModule } from 'vs/base/common/amd';
import { newWriteableBufferStream, VSBuffer, VSBufferReadableStream, streamToBufferReadableStream } from 'vs/base/common/buffer';
import { SUPPORTED_ENCODINGS } from 'vs/workbench/services/textfile/common/textfiles';

export async function detectEncodingByBOM(file: string): Promise<typeof encoding.UTF16be | typeof encoding.UTF16le | typeof encoding.UTF8_with_bom | null> {
try {
Expand Down Expand Up @@ -399,4 +400,14 @@ suite('Encoding', () => {
assert.equal(actual, expected);
});
});

test('encodingExists', async function () {
for (const enc in SUPPORTED_ENCODINGS) {
if (enc === encoding.UTF8_with_bom) {
continue; // skip over encodings from us
}

assert.equal(iconv.encodingExists(enc), true, enc);
}
});
});
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4594,10 +4594,10 @@ husky@^0.13.1:
is-ci "^1.0.9"
normalize-path "^1.0.0"

iconv-lite-umd@0.6.5:
version "0.6.5"
resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.5.tgz#6a1f621a3b4d125f72feff813a9839e1ebd6c722"
integrity sha512-WDegH4al+e3n3jTOStRvm+jzDA3JMUQGgzdAsMxAgcgB0Oi72HjfdsoX08ieKsy3rKexXVjWZr41aOIUaCZnMg==
iconv-lite-umd@0.6.6:
version "0.6.6"
resolved "https://registry.yarnpkg.com/iconv-lite-umd/-/iconv-lite-umd-0.6.6.tgz#d00c8a822a248066d22b1e90635d8506a469f357"
integrity sha512-I4CCm48Jh10a8ETkgqfu2RofZd9gIcQwAcEI2x9MjgvdrbKxk8DdGpyq3WB7064mJXBgGniZgWky435ropCpmw==

iconv-lite@^0.4.19:
version "0.4.19"
Expand Down