5 files changed, 26 insertions, 19 deletions
diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json
index 33d60d4dd..83ef00058 100644
--- a/editors/code/package-lock.json
+++ b/editors/code/package-lock.json
@@ -2409,32 +2409,32 @@
            }
        },
        "vscode-jsonrpc": {
-            "version": "6.0.0-next.5",
+            "version": "6.0.0-next.7",
-            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.5.tgz",
+            "resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.7.tgz",
-            "integrity": "sha512-IAgsltQPwg/pXOPsdXgbUTCaO9VSKZwirZN5SGtkdYQ/R3VjeC4v00WTVvoNayWMZpoC3O9u0ogqmsKzKhVasQ=="
+            "integrity": "sha512-1nG+6cuTtpzmXe7yYfO9GCkYlyV6Ai+jDnwidHiT2T7zhc+bJM+VTtc0T/CdTlDyTNTqIcCj0V1nD4TcVjJ7Ug=="
        },
        "vscode-languageclient": {
-            "version": "7.0.0-next.9",
+            "version": "7.0.0-next.12",
-            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.9.tgz",
+            "resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.12.tgz",
-            "integrity": "sha512-lFO+rN/i72CM2va6iKXq1lD7pJg8J93KEXf0w0boWVqU+DJhWzLrV3pXl8Xk1nCv//qOAyhlc/nx2KZCTeRF/A==",
+            "integrity": "sha512-OrzvOvhS5o26C0KctTJC7hkwh3avCwkVhllzy42AqwpIUZ3p2aVqkSG2uVxaeodq8ThBb3TLgtg50vxyWs6FEg==",
            "requires": {
                "semver": "^6.3.0",
-                "vscode-languageserver-protocol": "3.16.0-next.7"
+                "vscode-languageserver-protocol": "3.16.0-next.10"
            }
        },
        "vscode-languageserver-protocol": {
-            "version": "3.16.0-next.7",
+            "version": "3.16.0-next.10",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.7.tgz",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.10.tgz",
-            "integrity": "sha512-tOjrg+K3RddJ547zpC9/LAgTbzadkPuHlqJFFWIcKjVhiJOh73XyY+Ngcu9wukGaTsuSGjJ0W8rlmwanixa0FQ==",
+            "integrity": "sha512-YRTctHUZvts0Z1xXKNYU0ha0o+Tlgtwr+6O8OmDquM086N8exiSKBMwMC+Ra1QtIE+1mfW43Wxsme2FnMkAS9A==",
            "requires": {
-                "vscode-jsonrpc": "6.0.0-next.5",
+                "vscode-jsonrpc": "6.0.0-next.7",
-                "vscode-languageserver-types": "3.16.0-next.3"
+                "vscode-languageserver-types": "3.16.0-next.4"
            }
        },
        "vscode-languageserver-types": {
-            "version": "3.16.0-next.3",
+            "version": "3.16.0-next.4",
-            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.3.tgz",
+            "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.4.tgz",
-            "integrity": "sha512-s/z5ZqSe7VpoXJ6JQcvwRiPPA3nG0nAcJ/HH03zoU6QaFfnkcgPK+HshC3WKPPnC2G08xA0iRB6h7kmyBB5Adg=="
+            "integrity": "sha512-NlKJyGcET/ZBCCLBYIPaGo2c37R03bPYeWXozUtnjyye7+9dhlbMSODyoG2INcQf8zFmB4qhm2UOJjgYEgPCNA=="
        },
        "vscode-test": {
            "version": "1.4.0",
diff --git a/editors/code/package.json b/editors/code/package.json
index af845d7bc..eccafccdd 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -36,7 +36,7 @@
    },
    "dependencies": {
        "node-fetch": "^2.6.1",
-        "vscode-languageclient": "7.0.0-next.9"
+        "vscode-languageclient": "7.0.0-next.12"
    },
    "devDependencies": {
        "@rollup/plugin-commonjs": "^13.0.2",
diff --git a/editors/code/rust.tmGrammar.json b/editors/code/rust.tmGrammar.json
index 1b8cc713a..b3eec327b 100644
--- a/editors/code/rust.tmGrammar.json
+++ b/editors/code/rust.tmGrammar.json
@@ -140,6 +140,12 @@
            },
            "patterns": [
                {
+                    "include": "#block-comments"
+                },
+                {
+                    "include": "#comments"
+                },
+                {
                    "include": "#keywords"
                },
                {
diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts
index ed0db2924..38eb1c15b 100644
--- a/editors/code/src/inlay_hints.ts
+++ b/editors/code/src/inlay_hints.ts
@@ -60,6 +60,8 @@ function createHintStyle(hintKind: "type" | "parameter" | "chaining") {
                color: fg,
                backgroundColor: bg,
                fontStyle: "normal",
+                fontWeight: "normal",
+                textDecoration: ";font-size:smaller",
            },
        }),
        toDecoration(hint: ra.InlayHint, conv: lc.Protocol2CodeConverter): vscode.DecorationOptions {
diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts
index 08159b43c..53492a445 100644
--- a/editors/code/src/util.ts
+++ b/editors/code/src/util.ts
@@ -75,12 +75,11 @@ export async function sendRequestWithRetry<TParam, TRet>(
                log.warn("LSP request timed out", { method: reqType.method, param, error });
                throw error;
            }
+            if (error.code === lc.LSPErrorCodes.RequestCancelled) {
-            if (error.code === lc.ErrorCodes.RequestCancelled) {
                throw error;
            }
-            if (error.code !== lc.ErrorCodes.ContentModified) {
+            if (error.code !== lc.LSPErrorCodes.ContentModified) {
                log.warn("LSP request failed", { method: reqType.method, param, error });
                throw error;
            }

diff --git a/editors/code/package-lock.json b/editors/code/package-lock.json index 33d60d4dd..83ef00058 100644 --- a/editors/code/package-lock.json +++ b/editors/code/package-lock.json
@@ -2409,32 +2409,32 @@
2409	}	2409	}
2410	},	2410	},
2411	"vscode-jsonrpc": {	2411	"vscode-jsonrpc": {
2412	"version": "6.0.0-next.5",	2412	"version": "6.0.0-next.7",
2413	"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.5.tgz",	2413	"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-6.0.0-next.7.tgz",
2414	"integrity": "sha512-IAgsltQPwg/pXOPsdXgbUTCaO9VSKZwirZN5SGtkdYQ/R3VjeC4v00WTVvoNayWMZpoC3O9u0ogqmsKzKhVasQ=="	2414	"integrity": "sha512-1nG+6cuTtpzmXe7yYfO9GCkYlyV6Ai+jDnwidHiT2T7zhc+bJM+VTtc0T/CdTlDyTNTqIcCj0V1nD4TcVjJ7Ug=="
2415	},	2415	},
2416	"vscode-languageclient": {	2416	"vscode-languageclient": {
2417	"version": "7.0.0-next.9",	2417	"version": "7.0.0-next.12",
2418	"resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.9.tgz",	2418	"resolved": "https://registry.npmjs.org/vscode-languageclient/-/vscode-languageclient-7.0.0-next.12.tgz",
2419	"integrity": "sha512-lFO+rN/i72CM2va6iKXq1lD7pJg8J93KEXf0w0boWVqU+DJhWzLrV3pXl8Xk1nCv//qOAyhlc/nx2KZCTeRF/A==",	2419	"integrity": "sha512-OrzvOvhS5o26C0KctTJC7hkwh3avCwkVhllzy42AqwpIUZ3p2aVqkSG2uVxaeodq8ThBb3TLgtg50vxyWs6FEg==",
2420	"requires": {	2420	"requires": {
2421	"semver": "^6.3.0",	2421	"semver": "^6.3.0",
2422	"vscode-languageserver-protocol": "3.16.0-next.7"	2422	"vscode-languageserver-protocol": "3.16.0-next.10"
2423	}	2423	}
2424	},	2424	},
2425	"vscode-languageserver-protocol": {	2425	"vscode-languageserver-protocol": {
2426	"version": "3.16.0-next.7",	2426	"version": "3.16.0-next.10",
2427	"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.7.tgz",	2427	"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.10.tgz",
2428	"integrity": "sha512-tOjrg+K3RddJ547zpC9/LAgTbzadkPuHlqJFFWIcKjVhiJOh73XyY+Ngcu9wukGaTsuSGjJ0W8rlmwanixa0FQ==",	2428	"integrity": "sha512-YRTctHUZvts0Z1xXKNYU0ha0o+Tlgtwr+6O8OmDquM086N8exiSKBMwMC+Ra1QtIE+1mfW43Wxsme2FnMkAS9A==",
2429	"requires": {	2429	"requires": {
2430	"vscode-jsonrpc": "6.0.0-next.5",	2430	"vscode-jsonrpc": "6.0.0-next.7",
2431	"vscode-languageserver-types": "3.16.0-next.3"	2431	"vscode-languageserver-types": "3.16.0-next.4"
2432	}	2432	}
2433	},	2433	},
2434	"vscode-languageserver-types": {	2434	"vscode-languageserver-types": {
2435	"version": "3.16.0-next.3",	2435	"version": "3.16.0-next.4",
2436	"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.3.tgz",	2436	"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.4.tgz",
2437	"integrity": "sha512-s/z5ZqSe7VpoXJ6JQcvwRiPPA3nG0nAcJ/HH03zoU6QaFfnkcgPK+HshC3WKPPnC2G08xA0iRB6h7kmyBB5Adg=="	2437	"integrity": "sha512-NlKJyGcET/ZBCCLBYIPaGo2c37R03bPYeWXozUtnjyye7+9dhlbMSODyoG2INcQf8zFmB4qhm2UOJjgYEgPCNA=="
2438	},	2438	},
2439	"vscode-test": {	2439	"vscode-test": {
2440	"version": "1.4.0",	2440	"version": "1.4.0",


diff --git a/editors/code/package.json b/editors/code/package.json index af845d7bc..eccafccdd 100644 --- a/editors/code/package.json +++ b/editors/code/package.json
@@ -36,7 +36,7 @@
36	},	36	},
37	"dependencies": {	37	"dependencies": {
38	"node-fetch": "^2.6.1",	38	"node-fetch": "^2.6.1",
39	"vscode-languageclient": "7.0.0-next.9"	39	"vscode-languageclient": "7.0.0-next.12"
40	},	40	},
41	"devDependencies": {	41	"devDependencies": {
42	"@rollup/plugin-commonjs": "^13.0.2",	42	"@rollup/plugin-commonjs": "^13.0.2",


diff --git a/editors/code/rust.tmGrammar.json b/editors/code/rust.tmGrammar.json index 1b8cc713a..b3eec327b 100644 --- a/editors/code/rust.tmGrammar.json +++ b/editors/code/rust.tmGrammar.json
@@ -140,6 +140,12 @@
140	},	140	},
141	"patterns": [	141	"patterns": [
142	{	142	{
		143	"include": "#block-comments"
		144	},
		145	{
		146	"include": "#comments"
		147	},
		148	{
143	"include": "#keywords"	149	"include": "#keywords"
144	},	150	},
145	{	151	{


diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts index ed0db2924..38eb1c15b 100644 --- a/editors/code/src/inlay_hints.ts +++ b/editors/code/src/inlay_hints.ts
@@ -60,6 +60,8 @@ function createHintStyle(hintKind: "type" \| "parameter" \| "chaining") {
60	color: fg,	60	color: fg,
61	backgroundColor: bg,	61	backgroundColor: bg,
62	fontStyle: "normal",	62	fontStyle: "normal",
		63	fontWeight: "normal",
		64	textDecoration: ";font-size:smaller",
63	},	65	},
64	}),	66	}),
65	toDecoration(hint: ra.InlayHint, conv: lc.Protocol2CodeConverter): vscode.DecorationOptions {	67	toDecoration(hint: ra.InlayHint, conv: lc.Protocol2CodeConverter): vscode.DecorationOptions {


diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts index 08159b43c..53492a445 100644 --- a/editors/code/src/util.ts +++ b/editors/code/src/util.ts
@@ -75,12 +75,11 @@ export async function sendRequestWithRetry<TParam, TRet>(
75	log.warn("LSP request timed out", { method: reqType.method, param, error });	75	log.warn("LSP request timed out", { method: reqType.method, param, error });
76	throw error;	76	throw error;
77	}	77	}
78		78	if (error.code === lc.LSPErrorCodes.RequestCancelled) {
79	if (error.code === lc.ErrorCodes.RequestCancelled) {
80	throw error;	79	throw error;
81	}	80	}
82		81
83	if (error.code !== lc.ErrorCodes.ContentModified) {	82	if (error.code !== lc.LSPErrorCodes.ContentModified) {
84	log.warn("LSP request failed", { method: reqType.method, param, error });	83	log.warn("LSP request failed", { method: reqType.method, param, error });
85	throw error;	84	throw error;
86	}	85	}