aboutsummaryrefslogtreecommitdiff
path: root/editors/vscode/client/diagcache.js
diff options
context:
space:
mode:
Diffstat (limited to 'editors/vscode/client/diagcache.js')
-rw-r--r--editors/vscode/client/diagcache.js12
1 files changed, 10 insertions, 2 deletions
diff --git a/editors/vscode/client/diagcache.js b/editors/vscode/client/diagcache.js
index 6e77207..2e1758a 100644
--- a/editors/vscode/client/diagcache.js
+++ b/editors/vscode/client/diagcache.js
@@ -42,6 +42,7 @@ function includeNames(text) {
while ((m = tokens.exec(text)) !== null) {
const token = m[0];
if (token.startsWith('//') || token.startsWith('/*')) continue;
+ // include std; names the library that is part of the compiler: there is no file to read
if (include && token.startsWith('"')) {
names.push(token.slice(1, -1).replace(/\\([\\"nrt0])/g, (_, c) => ({ n: '\n', r: '\r', t: '\t', 0: '\0' })[c] || c));
}
@@ -80,13 +81,20 @@ function sourceTree(text, docPath, workspace) {
// the key for a document and the files it reads. key is null when the tree is
// too large to cover, and then nothing is cached. deps lists every file the
// tree names (existing or not), so a change to any of them can be noticed.
+// texts maps each file that exists to its text, which a server with no files
+// of its own is sent before it checks the document.
function diagKey(stamp, text, docPath, workspace) {
const tree = sourceTree(text, docPath, workspace);
const deps = [...tree.files.keys()].sort();
- if (!tree.complete) return { key: null, deps };
+ const texts = new Map();
+ for (const [p, hash] of tree.files) {
+ if (hash === 'missing') continue;
+ try { texts.set(p, fs.readFileSync(p, 'utf8')); } catch (e) { /* gone since it was hashed */ }
+ }
+ if (!tree.complete) return { key: null, deps, texts };
const parts = [stamp, docPath, sha256(text)];
for (const p of deps) parts.push(p + '=' + tree.files.get(p));
- return { key: sha256(parts.join('\n')), deps };
+ return { key: sha256(parts.join('\n')), deps, texts };
}
// the cache itself: key -> diagnostics, least recently used first. saved is