Skip to content

Commit dd1e484

Browse files
authored
Port md fixes to release branch (microsoft#164986)
This is a cherry pick of two fixes: - microsoft#164945 which fixes microsoft#164932 by picking up a new md language service version - microsoft#164942 which fixes microsoft#164562 by fixing a bug with the md workspace implementation
1 parent 9457382 commit dd1e484

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"vscode-languageserver": "^8.0.2",
1818
"vscode-languageserver-textdocument": "^1.0.5",
1919
"vscode-languageserver-types": "^3.17.1",
20-
"vscode-markdown-languageservice": "^0.2.0-alpha.7",
20+
"vscode-markdown-languageservice": "^0.2.0-alpha.8",
2121
"vscode-nls": "^5.2.0",
2222
"vscode-uri": "^3.0.3"
2323
},

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class VsCodeDocument implements md.ITextDocument {
6565
}
6666

6767
hasInMemoryDoc(): boolean {
68-
return !this.inMemoryDoc;
68+
return !!this.inMemoryDoc;
6969
}
7070

7171
isDetached(): boolean {
@@ -176,7 +176,7 @@ export class VsCodeClientWorkspace implements md.IWorkspaceWithWatching {
176176
// Check that if file has been deleted on disk.
177177
// This can happen when directories are renamed / moved. VS Code's file system watcher does not
178178
// notify us when this happens.
179-
if (await this.statBypassingCache(uri) === undefined) {
179+
if (!(await this.statBypassingCache(uri))) {
180180
if (this._documentCache.get(uri) === doc && !doc.hasInMemoryDoc()) {
181181
this.doDeleteDocument(uri);
182182
return;
@@ -355,7 +355,8 @@ export class VsCodeClientWorkspace implements md.IWorkspaceWithWatching {
355355
if (this.documents.get(uri)) {
356356
return { isDirectory: false };
357357
}
358-
return this.connection.sendRequest(protocol.fs_stat, { uri });
358+
const fsResult = await this.connection.sendRequest(protocol.fs_stat, { uri });
359+
return fsResult ?? undefined; // Force convert null to undefined
359360
}
360361

361362
async readDirectory(resource: URI): Promise<[string, md.FileStat][]> {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ vscode-languageserver@^8.0.2:
4242
dependencies:
4343
vscode-languageserver-protocol "3.17.2"
4444

45-
vscode-markdown-languageservice@^0.2.0-alpha.7:
46-
version "0.2.0-alpha.7"
47-
resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.2.0-alpha.7.tgz#1f5fd345630e9d0d585cb00155d433c2320fa9c2"
48-
integrity sha512-5QYz1+LpvazK21Hphx8wZiZIXE9cQ9R3jzhQr+I89xNHJi+NWTEBA555ZFkaaYR68B7SI7OQ4jihjkGLZTUTnw==
45+
vscode-markdown-languageservice@^0.2.0-alpha.8:
46+
version "0.2.0-alpha.8"
47+
resolved "https://registry.yarnpkg.com/vscode-markdown-languageservice/-/vscode-markdown-languageservice-0.2.0-alpha.8.tgz#f77c20adea2ddafdad88b99b09be1778c358ca42"
48+
integrity sha512-kydgGkSarjFk71culFover7lBym82wmJdvuqCzS3IPZV+fhW1l0poca/Dt4bDku3ioda0kNH9xdmi0fiHkIDUQ==
4949
dependencies:
5050
picomatch "^2.3.1"
5151
vscode-languageserver-textdocument "^1.0.5"

0 commit comments

Comments
 (0)