@adecore/editor-react 0.31.11 → 0.32.0

package/dist/code-authors.js

@@ -8,72 +8,81 @@ export const UNCOMMITTED = -1;
  * pasted has none, which reads as uncommitted. Null when the blame is not of that text.
  */
 export function mapBlame(blame, base, current) {
-    const baseLines = splitLines(base);
-    if (blame.lines.length !== baseLines.length) {
-        return null;
+  const baseLines = splitLines(base);
+  if (blame.lines.length !== baseLines.length) {
+    return null;
+  }
+  const mapped = new Int32Array(current.length).fill(UNCOMMITTED);
+  let basePosition = 0;
+  let position = 0;
+  const carry = until => {
+    for (; position < until; position++, basePosition++) {
+      mapped[position] = blame.lines[basePosition];
     }
-    const mapped = new Int32Array(current.length).fill(UNCOMMITTED);
-    let basePosition = 0;
-    let position = 0;
-    const carry = (until) => {
-        for (; position < until; position++, basePosition++) {
-            mapped[position] = blame.lines[basePosition];
-        }
-    };
-    for (const change of diffLines(baseLines, current)) {
-        carry(change.otherStart);
-        position = change.otherEnd;
-        basePosition = change.baseEnd;
-    }
-    carry(current.length);
-    return mapped;
+  };
+  for (const change of diffLines(baseLines, current)) {
+    carry(change.otherStart);
+    position = change.otherEnd;
+    basePosition = change.baseEnd;
+  }
+  carry(current.length);
+  return mapped;
 }
 /* A person's name as git has it, with runs of space made one. */
 export function shortName(name) {
-    return name.replace(/\s+/g, ' ').trim();
+  return name.replace(/\s+/g, ' ').trim();
 }
 /*
  * Who wrote the lines `from` through `to`. Blank lines count for no one and a line that is not
  * committed for no author, so a method that is only edited keeps its author and says it was edited.
  */
 export function authorshipOf(commits, mapped, lines, from, to) {
-    const byName = new Map();
-    let uncommittedLines = 0;
-    let modified = false;
-    let latest = null;
-    for (let line = from; line <= to && line < mapped.length; line++) {
-        const index = mapped[line];
-        if (index === UNCOMMITTED) {
-            modified = true;
-        }
-        if (lines[line].trim() === '') {
-            continue;
-        }
-        if (index === UNCOMMITTED) {
-            uncommittedLines++;
-            continue;
-        }
-        const commit = commits[index];
-        const name = shortName(commit.author);
-        if (name === '') {
-            continue;
-        }
-        const author = byName.get(name) ?? { name, email: commit.email, lines: 0 };
-        author.lines++;
-        byName.set(name, author);
-        if (latest === null || commit.at > latest.at) {
-            latest = commit;
-        }
+  const byName = new Map();
+  let uncommittedLines = 0;
+  let modified = false;
+  let latest = null;
+  for (let line = from; line <= to && line < mapped.length; line++) {
+    const index = mapped[line];
+    if (index === UNCOMMITTED) {
+      modified = true;
+    }
+    if (lines[line].trim() === '') {
+      continue;
+    }
+    if (index === UNCOMMITTED) {
+      uncommittedLines++;
+      continue;
+    }
+    const commit = commits[index];
+    const name = shortName(commit.author);
+    if (name === '') {
+      continue;
     }
-    const authors = [...byName.values()].sort((left, right) => right.lines - left.lines || (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));
-    return { authors, uncommittedLines, modified, latest };
+    const author = byName.get(name) ?? {
+      name,
+      email: commit.email,
+      lines: 0
+    };
+    author.lines++;
+    byName.set(name, author);
+    if (latest === null || commit.at > latest.at) {
+      latest = commit;
+    }
+  }
+  const authors = [...byName.values()].sort((left, right) => right.lines - left.lines || (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));
+  return {
+    authors,
+    uncommittedLines,
+    modified,
+    latest
+  };
 }
 /* The row's words: the author with most lines, how many others wrote some, and a star when the range is edited since the commit. */
 export function authorsText(authorship, i18n) {
-    const main = authorship.authors[0];
-    if (main === undefined) {
-        return i18n.t('editor:language.codeVision.newCode');
-    }
-    const others = authorship.authors.length - 1;
-    return `${main.name}${others > 0 ? ` +${formatNumber(others)}` : ''}${authorship.modified ? ' *' : ''}`;
-}
+  const main = authorship.authors[0];
+  if (main === undefined) {
+    return i18n.t('editor:language.codeVision.newCode');
+  }
+  const others = authorship.authors.length - 1;
+  return `${main.name}${others > 0 ? ` +${formatNumber(others)}` : ''}${authorship.modified ? ' *' : ''}`;
+}

package/dist/code-vision-model.js

@@ -18,118 +18,124 @@ const CALLABLES = new Set([METHOD, FUNCTION]);
 /* Languages whose `#` starts a comment, so a docblock written with it is passed like any other. */
 const HASH_COMMENTS = new Set(['php', 'python', 'shellscript', 'ruby', 'yaml', 'dockerfile']);
 function isLocalName(name) {
-    return name === '' || name.startsWith('<') || name === 'default';
+  return name === '' || name.startsWith('<') || name === 'default';
 }
 function isUsageKind(kind, parentKind) {
-    if (TYPES.has(kind) || CALLABLES.has(kind)) {
-        return true;
-    }
-    return (kind === PROPERTY || kind === FIELD || kind === CONSTANT) && (parentKind === CLASS || parentKind === STRUCT);
+  if (TYPES.has(kind) || CALLABLES.has(kind)) {
+    return true;
+  }
+  return (kind === PROPERTY || kind === FIELD || kind === CONSTANT) && (parentKind === CLASS || parentKind === STRUCT);
 }
 function isAuthorKind(kind) {
-    return TYPES.has(kind) || CALLABLES.has(kind) || kind === CONSTRUCTOR;
+  return TYPES.has(kind) || CALLABLES.has(kind) || kind === CONSTRUCTOR;
 }
 function walk(symbols, path, parentKind, out) {
-    for (const symbol of symbols) {
-        out.push({
-            name: symbol.name,
-            kind: symbol.kind,
-            start: symbol.range.start,
-            end: symbol.range.end,
-            namePosition: symbol.selectionRange.start,
-            path,
-            parentKind
-        });
-        // What a function or a method holds is local to it, and a row for a callback is noise.
-        if (CONTAINERS.has(symbol.kind)) {
-            walk(symbol.children ?? [], [...path, symbol.name], symbol.kind, out);
-        }
+  for (const symbol of symbols) {
+    out.push({
+      name: symbol.name,
+      kind: symbol.kind,
+      start: symbol.range.start,
+      end: symbol.range.end,
+      namePosition: symbol.selectionRange.start,
+      path,
+      parentKind
+    });
+    // What a function or a method holds is local to it, and a row for a callback is noise.
+    if (CONTAINERS.has(symbol.kind)) {
+      walk(symbol.children ?? [], [...path, symbol.name], symbol.kind, out);
     }
+  }
 }
 function candidatesOf(result) {
-    const out = [];
-    if (result === null || result.length === 0) {
-        return out;
-    }
-    if ('range' in result[0]) {
-        walk(result, [], null, out);
-        return out;
-    }
-    const flat = result;
-    const containers = new Map(flat.filter((symbol) => CONTAINERS.has(symbol.kind)).map((symbol) => [symbol.name, symbol.kind]));
-    for (const symbol of flat) {
-        const container = symbol.containerName ?? '';
-        if (container !== '' && !containers.has(container)) {
-            continue;
-        }
-        out.push({
-            name: symbol.name,
-            kind: symbol.kind,
-            start: symbol.location.range.start,
-            end: symbol.location.range.end,
-            namePosition: null,
-            path: container === '' ? [] : [container],
-            parentKind: container === '' ? null : (containers.get(container) ?? null)
-        });
-    }
+  const out = [];
+  if (result === null || result.length === 0) {
     return out;
+  }
+  if ('range' in result[0]) {
+    walk(result, [], null, out);
+    return out;
+  }
+  const flat = result;
+  const containers = new Map(flat.filter(symbol => CONTAINERS.has(symbol.kind)).map(symbol => [symbol.name, symbol.kind]));
+  for (const symbol of flat) {
+    const container = symbol.containerName ?? '';
+    if (container !== '' && !containers.has(container)) {
+      continue;
+    }
+    out.push({
+      name: symbol.name,
+      kind: symbol.kind,
+      start: symbol.location.range.start,
+      end: symbol.location.range.end,
+      namePosition: null,
+      path: container === '' ? [] : [container],
+      parentKind: container === '' ? null : containers.get(container) ?? null
+    });
+  }
+  return out;
 }
 /*
  * Where a declaration really starts: past the comments and the blank lines a server counts into its
  * range. Null when its range is nothing but comments.
  */
 export function startAfterComments(source, from, to) {
-    const hash = HASH_COMMENTS.has(source.languageId);
-    let line = from.line;
-    let character = from.character;
-    while (line <= to.line && line < source.lineCount) {
-        const text = source.lineAt(line);
-        let at = character;
-        while (at < text.length && (text[at] === ' ' || text[at] === '\t')) {
-            at++;
-        }
-        if (at >= text.length) {
-            line++;
-            character = 0;
-            continue;
-        }
-        if (text.startsWith('/*', at)) {
-            let end = text.indexOf('*/', at + 2);
-            let scan = line;
-            while (end === -1 && scan + 1 <= to.line && scan + 1 < source.lineCount) {
-                scan++;
-                end = source.lineAt(scan).indexOf('*/');
-            }
-            if (end === -1) {
-                return null;
-            }
-            line = scan;
-            character = end + 2;
-            continue;
-        }
-        if (text.startsWith('//', at) || (hash && text[at] === '#' && text[at + 1] !== '[')) {
-            line++;
-            character = 0;
-            continue;
-        }
-        return line > to.line ? null : { line, character: at };
+  const hash = HASH_COMMENTS.has(source.languageId);
+  let line = from.line;
+  let character = from.character;
+  while (line <= to.line && line < source.lineCount) {
+    const text = source.lineAt(line);
+    let at = character;
+    while (at < text.length && (text[at] === ' ' || text[at] === '\t')) {
+      at++;
+    }
+    if (at >= text.length) {
+      line++;
+      character = 0;
+      continue;
     }
-    return null;
+    if (text.startsWith('/*', at)) {
+      let end = text.indexOf('*/', at + 2);
+      let scan = line;
+      while (end === -1 && scan + 1 <= to.line && scan + 1 < source.lineCount) {
+        scan++;
+        end = source.lineAt(scan).indexOf('*/');
+      }
+      if (end === -1) {
+        return null;
+      }
+      line = scan;
+      character = end + 2;
+      continue;
+    }
+    if (text.startsWith('//', at) || hash && text[at] === '#' && text[at + 1] !== '[') {
+      line++;
+      character = 0;
+      continue;
+    }
+    return line > to.line ? null : {
+      line,
+      character: at
+    };
+  }
+  return null;
 }
 const CLOSERS = /^\s*[})\]]*[;,]?\s*$/;
 /* The last line of a declaration that holds more than the brackets that close it or nothing, which is what its authors are read from. */
 function lastLineWithCode(source, from, to) {
-    for (let line = Math.min(to, source.lineCount - 1); line > from; line--) {
-        if (!CLOSERS.test(source.lineAt(line))) {
-            return line;
-        }
+  for (let line = Math.min(to, source.lineCount - 1); line > from; line--) {
+    if (!CLOSERS.test(source.lineAt(line))) {
+      return line;
     }
-    return from;
+  }
+  return from;
 }
 /* Where the name starts when a server gave only a range: its first occurrence on the line the declaration starts on. */
 function nameIn(source, name, start) {
-    const at = source.lineAt(start.line).indexOf(name, start.character);
-    return at === -1 ? null : { line: start.line, character: at };
+  const at = source.lineAt(start.line).indexOf(name, start.character);
+  return at === -1 ? null : {
+    line: start.line,
+    character: at
+  };
 }
 /*
  * The declarations of a file a row is drawn above: classes, interfaces, enums, structs, functions and
@@ -137,47 +143,48 @@ function nameIn(source, name, start) {
  * function. Only one that starts its line gets a row, since a row sits above the line.
  */
 export function declarationsOf(result, source) {
-    const declarations = [];
-    const seen = new Map();
-    for (const candidate of candidatesOf(result)) {
-        if (isLocalName(candidate.name)) {
-            continue;
-        }
-        const usages = isUsageKind(candidate.kind, candidate.parentKind) && !candidate.name.startsWith('__');
-        const authors = isAuthorKind(candidate.kind);
-        if (!usages && !authors) {
-            continue;
-        }
-        const start = startAfterComments(source, candidate.start, candidate.end);
-        if (start === null || source.lineAt(start.line).slice(0, start.character).trim() !== '') {
-            continue;
-        }
-        const position = candidate.namePosition ?? nameIn(source, candidate.name, start);
-        if (position === null) {
-            continue;
-        }
-        const key = `${candidate.path.join('>')}>${candidate.name}#${candidate.kind}`;
-        const index = seen.get(key) ?? 0;
-        seen.set(key, index + 1);
-        declarations.push({
-            id: `${key}#${index}`,
-            name: candidate.name,
-            position,
-            line: start.line,
-            usages,
-            authors,
-            authorFrom: position.line,
-            authorTo: lastLineWithCode(source, position.line, candidate.end.line)
-        });
-        if (declarations.length > MAX_DECLARATIONS) {
-            return [];
-        }
+  const declarations = [];
+  const seen = new Map();
+  for (const candidate of candidatesOf(result)) {
+    if (isLocalName(candidate.name)) {
+      continue;
+    }
+    const usages = isUsageKind(candidate.kind, candidate.parentKind) && !candidate.name.startsWith('__');
+    const authors = isAuthorKind(candidate.kind);
+    if (!usages && !authors) {
+      continue;
+    }
+    const start = startAfterComments(source, candidate.start, candidate.end);
+    if (start === null || source.lineAt(start.line).slice(0, start.character).trim() !== '') {
+      continue;
     }
-    return declarations;
+    const position = candidate.namePosition ?? nameIn(source, candidate.name, start);
+    if (position === null) {
+      continue;
+    }
+    const key = `${candidate.path.join('>')}>${candidate.name}#${candidate.kind}`;
+    const index = seen.get(key) ?? 0;
+    seen.set(key, index + 1);
+    declarations.push({
+      id: `${key}#${index}`,
+      name: candidate.name,
+      position,
+      line: start.line,
+      usages,
+      authors,
+      authorFrom: position.line,
+      authorTo: lastLineWithCode(source, position.line, candidate.end.line)
+    });
+    if (declarations.length > MAX_DECLARATIONS) {
+      return [];
+    }
+  }
+  return declarations;
 }
 /* "No usages", "1 usage" and "N usages". */
 export function usagesText(count, i18n) {
-    return count === 0
-        ? i18n.t('editor:language.codeVision.usagesNone')
-        : i18n.t('editor:language.codeVision.usages', { count, formatted: formatNumber(count) });
-}
+  return count === 0 ? i18n.t('editor:language.codeVision.usagesNone') : i18n.t('editor:language.codeVision.usages', {
+    count,
+    formatted: formatNumber(count)
+  });
+}