aboutsummaryrefslogtreecommitdiff
path: root/editors/code/src
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-06-12 11:36:47 +0100
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-06-12 11:36:47 +0100
commit03645c55761f8c9345ee3837a6010e65e7a80179 (patch)
tree9c24cb112429b0334762063e71a65a1907386e59 /editors/code/src
parent6296f51678843c96a4ab1f1e6784b6d69222e072 (diff)
parentfed52706def9a9f5d33edc7dd9848a02ae475ba5 (diff)
Merge #1382
1382: use salsa's LRU for syntax trees r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'editors/code/src')
-rw-r--r--editors/code/src/config.ts4
-rw-r--r--editors/code/src/server.ts3
2 files changed, 6 insertions, 1 deletions
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts
index 8d73a6b34..3024546d2 100644
--- a/editors/code/src/config.ts
+++ b/editors/code/src/config.ts
@@ -19,6 +19,7 @@ export class Config {
19 public enableEnhancedTyping = true; 19 public enableEnhancedTyping = true;
20 public raLspServerPath = RA_LSP_DEBUG || 'ra_lsp_server'; 20 public raLspServerPath = RA_LSP_DEBUG || 'ra_lsp_server';
21 public showWorkspaceLoadedNotification = true; 21 public showWorkspaceLoadedNotification = true;
22 public lruCapacity: null | number = null;
22 public cargoWatchOptions: CargoWatchOptions = { 23 public cargoWatchOptions: CargoWatchOptions = {
23 enableOnStartup: 'ask', 24 enableOnStartup: 'ask',
24 trace: 'off', 25 trace: 'off',
@@ -109,5 +110,8 @@ export class Config {
109 '' 110 ''
110 ); 111 );
111 } 112 }
113 if (config.has('lruCapacity')) {
114 this.lruCapacity = config.get('lruCapacity') as number;
115 }
112 } 116 }
113} 117}
diff --git a/editors/code/src/server.ts b/editors/code/src/server.ts
index 81c2b3fff..7029142fd 100644
--- a/editors/code/src/server.ts
+++ b/editors/code/src/server.ts
@@ -35,7 +35,8 @@ export class Server {
35 initializationOptions: { 35 initializationOptions: {
36 publishDecorations: true, 36 publishDecorations: true,
37 showWorkspaceLoaded: 37 showWorkspaceLoaded:
38 Server.config.showWorkspaceLoadedNotification 38 Server.config.showWorkspaceLoadedNotification,
39 lruCapacity: Server.config.lruCapacity
39 }, 40 },
40 traceOutputChannel 41 traceOutputChannel
41 }; 42 };