Skip to content

Commit 04ef3da

Browse files
authored
Adopt @vscode/l10n for markdown language server (microsoft#165880)
1 parent 4fdcdb1 commit 04ef3da

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

extensions/markdown-language-features/server/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
"out/**/*.js"
1515
],
1616
"dependencies": {
17+
"@vscode/l10n": "^0.0.10",
1718
"vscode-languageserver": "^8.0.2",
1819
"vscode-languageserver-textdocument": "^1.0.5",
1920
"vscode-languageserver-types": "^3.17.1",
2021
"vscode-markdown-languageservice": "^0.2.0",
21-
"vscode-nls": "^5.2.0",
2222
"vscode-uri": "^3.0.3"
2323
},
2424
"devDependencies": {

extensions/markdown-language-features/server/src/server.ts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { CancellationToken, Connection, InitializeParams, InitializeResult, Note
77
import { TextDocument } from 'vscode-languageserver-textdocument';
88
import * as lsp from 'vscode-languageserver-types';
99
import * as md from 'vscode-markdown-languageservice';
10-
import * as nls from 'vscode-nls';
1110
import { URI } from 'vscode-uri';
1211
import { getLsConfiguration, LsConfiguration } from './config';
1312
import { ConfigurationManager } from './configuration';
@@ -16,8 +15,7 @@ import { LogFunctionLogger } from './logging';
1615
import * as protocol from './protocol';
1716
import { IDisposable } from './util/dispose';
1817
import { VsCodeClientWorkspace } from './workspace';
19-
20-
const localize = nls.loadMessageBundle();
18+
import * as l10n from '@vscode/l10n';
2119

2220
interface MdServerInitializationOptions extends LsConfiguration { }
2321

@@ -204,7 +202,7 @@ export async function startServer(connection: Connection, serverConfig: {
204202

205203
if (params.context.only?.some(kind => kind === 'source' || kind.startsWith('source.'))) {
206204
const action: lsp.CodeAction = {
207-
title: localize('organizeLinkDefAction.title', "Organize link definitions"),
205+
title: l10n.t("Organize link definitions"),
208206
kind: organizeLinkDefKind,
209207
data: <OrganizeLinkActionData>{ uri: document.uri }
210208
};

extensions/markdown-language-features/server/yarn.lock

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77
resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.59.tgz#823f238b9063ccc3b3b7f13186f143a57926c4f6"
88
integrity sha512-6u+36Dj3aDzhfBVUf/mfmc92OEdzQ2kx2jcXGdigfl70E/neV21ZHE6UCz4MDzTRcVqGAM27fk+DLXvyDsn3Jw==
99

10+
"@vscode/l10n@^0.0.10":
11+
version "0.0.10"
12+
resolved "https://registry.yarnpkg.com/@vscode/l10n/-/l10n-0.0.10.tgz#9c513107c690c0dd16e3ec61e453743de15ebdb0"
13+
integrity sha512-E1OCmDcDWa0Ya7vtSjp/XfHFGqYJfh+YPC1RkATU71fTac+j1JjCcB3qwSzmlKAighx2WxhLlfhS0RwAN++PFQ==
14+
1015
picomatch@^2.3.1:
1116
version "2.3.1"
1217
resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
@@ -53,7 +58,7 @@ vscode-markdown-languageservice@^0.2.0:
5358
vscode-nls "^5.0.1"
5459
vscode-uri "^3.0.3"
5560

56-
vscode-nls@^5.0.1, vscode-nls@^5.2.0:
61+
vscode-nls@^5.0.1:
5762
version "5.2.0"
5863
resolved "https://registry.yarnpkg.com/vscode-nls/-/vscode-nls-5.2.0.tgz#3cb6893dd9bd695244d8a024bdf746eea665cc3f"
5964
integrity sha512-RAaHx7B14ZU04EU31pT+rKz2/zSl7xMsfIZuo8pd+KZO6PXtQmpevpq3vxvWNcrGbdmhM/rr5Uw5Mz+NBfhVng==

0 commit comments

Comments
 (0)