Skip to content

Commit 68079a9

Browse files
authored
Encoding euckr does not exist anymore (fix #101847) (#101853)
1 parent e95f9e6 commit 68079a9

File tree

11 files changed

+36
-25
lines changed

11 files changed

+36
-25
lines changed

build/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"gulp-bom": "^1.0.0",
3939
"gulp-sourcemaps": "^1.11.0",
4040
"gulp-uglify": "^3.0.0",
41-
"iconv-lite-umd": "0.6.5",
41+
"iconv-lite-umd": "0.6.6",
4242
"mime": "^1.3.4",
4343
"minimatch": "3.0.4",
4444
"minimist": "^1.2.3",

build/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1428,10 +1428,10 @@ https-proxy-agent@^4.0.0:
14281428
agent-base "5"
14291429
debug "4"
14301430

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

14361436
ignore@^5.1.1:
14371437
version "5.1.2"

extensions/git/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1878,7 +1878,7 @@
18781878
"dependencies": {
18791879
"byline": "^5.0.0",
18801880
"file-type": "^7.2.0",
1881-
"iconv-lite-umd": "0.6.5",
1881+
"iconv-lite-umd": "0.6.6",
18821882
"jschardet": "2.1.1",
18831883
"vscode-extension-telemetry": "0.1.1",
18841884
"vscode-nls": "^4.0.0",

extensions/git/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -425,10 +425,10 @@ https-proxy-agent@^2.2.1:
425425
agent-base "^4.3.0"
426426
debug "^3.1.0"
427427

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

433433
inflight@^1.0.4:
434434
version "1.0.6"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
"graceful-fs": "4.2.3",
4848
"http-proxy-agent": "^2.1.0",
4949
"https-proxy-agent": "^2.2.3",
50-
"iconv-lite-umd": "0.6.5",
50+
"iconv-lite-umd": "0.6.6",
5151
"jschardet": "2.1.1",
5252
"keytar": "^5.5.0",
5353
"minimist": "^1.2.5",

remote/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"graceful-fs": "4.2.3",
99
"http-proxy-agent": "^2.1.0",
1010
"https-proxy-agent": "^2.2.3",
11-
"iconv-lite-umd": "0.6.5",
11+
"iconv-lite-umd": "0.6.6",
1212
"jschardet": "2.1.1",
1313
"minimist": "^1.2.5",
1414
"native-watchdog": "1.3.0",

remote/web/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"version": "0.0.0",
44
"dependencies": {
55
"semver-umd": "^5.5.7",
6-
"iconv-lite-umd": "0.6.5",
6+
"iconv-lite-umd": "0.6.6",
77
"jschardet": "2.1.1",
88
"vscode-oniguruma": "1.3.1",
99
"vscode-textmate": "5.2.0",

remote/web/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# yarn lockfile v1
33

44

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

1010
1111
version "2.1.1"

remote/yarn.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,10 @@ https-proxy-agent@^4.0.0:
196196
agent-base "5"
197197
debug "4"
198198

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

204204
ip@^1.1.5:
205205
version "1.1.5"

src/vs/workbench/services/textfile/test/node/encoding/encoding.test.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import * as streams from 'vs/base/common/stream';
1111
import * as iconv from 'iconv-lite-umd';
1212
import { getPathFromAmdModule } from 'vs/base/common/amd';
1313
import { newWriteableBufferStream, VSBuffer, VSBufferReadableStream, streamToBufferReadableStream } from 'vs/base/common/buffer';
14+
import { SUPPORTED_ENCODINGS } from 'vs/workbench/services/textfile/common/textfiles';
1415

1516
export async function detectEncodingByBOM(file: string): Promise<typeof encoding.UTF16be | typeof encoding.UTF16le | typeof encoding.UTF8_with_bom | null> {
1617
try {
@@ -399,4 +400,14 @@ suite('Encoding', () => {
399400
assert.equal(actual, expected);
400401
});
401402
});
403+
404+
test('encodingExists', async function () {
405+
for (const enc in SUPPORTED_ENCODINGS) {
406+
if (enc === encoding.UTF8_with_bom) {
407+
continue; // skip over encodings from us
408+
}
409+
410+
assert.equal(iconv.encodingExists(enc), true, enc);
411+
}
412+
});
402413
});

0 commit comments

Comments
 (0)