Saving progress

Author: Aerijo

lib/context-helpers.js

@@ -1,37 +1,93 @@
-module.exports = { isPackageOrClass, isEnvDelim, isRef };
+const { Range } = require("atom");
 
-function isPackageOrClass(editor, point, lineStart) {
-  // if (lineStart.length > )
-  if (lineStart.match(/\\(?:usepackage|documentclass)\s*(?:\[.*?\])?\{$/)) {
+module.exports = { isFilePath, isPackageOrClass, isEnvDelim, isRef, getBraceContents };
+
+function isFilePath(editor, point, context) {
+  /**
+  * Notes on syntax of file path commands:
+  * - \input only takes a single path; minimal def. is just file name.
+  * - \include takes comma separated list of paths, just file name is also minimal requirement
+  * - Other commands:
+  *   - \includeonly,
+  *   - \includegraphics,
+  *   - \inputminted,
+  *   - \addbibresource,
+  *   - !TeX root = NOTE: This one won't be picked up by the brace contents; maybe transfer to separate function?
+  */
+
+  
+
+}
+
+
+function isPackageOrClass(editor, point, context) {
+  let lineStart = context.line.slice(0, context.index);
+  let pkgRegex = /\\(?:usepackage|documentclass)\s*(?:\[.*?\])?\{[^\}]*$/;
+  if (lineStart.match(pkgRegex)) {
     return true;
+  } else {
+    return context.scopes.includes("support.class.latex"); // probably more consistent
   }
+}
 
-  // If the simple check doesn't work, try with scope (provided by grammar package) support.
-  // will not work (or will lead to strange results) if the package does not follow `language-latex` conventions
-  let scopes = editor.scopeDescriptorForBufferPosition(point).getScopesArray();
-  let includes = scopes.includes("support.class.latex", 1); // first index is always root scope, so skip it
-  return includes;
+function isEnvDelim(editor, point, context) {
+  let line = context.line;
+  let index = context.startIndex;
+  let envRegex = /\\(begin|end)\s*\{[^\}]*$/;
+  let env = line.slice(0, index).match(envRegex);
+  if (env) {
+    return env[1];
+  } else {
+    return false;
+  }
 }
 
-function isEnvDelim(lineStart) {
-  return lineStart.match(/\\(?:begin|end)\s*\{$/);
+function isRef(editor, point, context) {
+  let line = context.line;
+
+  let refRegex = /\\((?:auto|name|page|eq|cpage|c|labelc)?ref(?:\*)?)\s*\{[^\}]*$/i;
+  let ref = line.slice(0, point.column).match(refRegex);
+  if (ref) { let command = ref[1]; return command; }
+
+  let scopes = context.scopes;
+  if (scopes.includes("meta.reference.latex")) {
+    return "UNKNOWN REF COMMAND"; // need to find better way to handle this
+  }
+
+  return false;
 }
 
+/**
+* The given point represents the location of where the cursor
+* would go if the user clicked. The indexing is to the left
+* hand side of each character. I.e, if the line is
+*
+* >> "abc"
+*
+* - clicking to the left hand side of the "a" would make the
+* Point [row, 0], and the character at index 0 is the "a".
+*
+* - clicking to the right of the "a" is Point [row, 1]
+* and the character at that index is "b"
+*
+* TL;DR: I dislike fencepost off-by-one things. Each point
+* is a space between letters and is "asscoiated" with the letter
+* to it's right.
+*/
+function getBraceContents(editor, point, context) {
+  let index = point.column;
+  let line = context.line;
 
-function isRef(line, lineIndex) {
-  let startRef = line.slice(0, lineIndex).match(/\\(?:auto|name|page|eq|cpage|c|labelc)?ref(?:\*)?\{([^\}]*)$/i);
-  if (!startRef) { return false; }
+  let contentsStartIndex = line.lastIndexOf("{", index - 1); // if charAt == "{", then they clicked to the left of it and shouldn't match
+  let contentsEndIndex   = line.indexOf("}", index); // if charAt == "}", they clicked to left and it's fine
 
-  let endRef = line.slice(lineIndex).match(/^(.*?)\}/);
-  if (!endRef) { return false; }
-  let refStartIndex = startRef.index + startRef[0].match("{").index + 1;
-  let refEndIndex = endRef[0].match("}").index + lineIndex;
+  if (contentsStartIndex === -1 || contentsEndIndex === -1) { return null; }
 
-  // console.log(refStartIndex, refEndIndex, line.slice(refStartIndex, refEndIndex), line);
+  let range = new Range([point.row, contentsStartIndex + 1], [point.row, contentsEndIndex]);
+  let value = editor.getTextInBufferRange(range);
 
   return {
-    value: startRef[1] + endRef[1],
-    refStartIndex,
-    refEndIndex
+    value,
+    range
   };
 }

lib/document-parser.js

@@ -69,7 +69,7 @@ class UniqueDocumentTree {
 
       // Get all the file paths in the current file / node and store them as unsorted
       fs.readFile(currentPath, "utf8", (err, data) => {
-        if (err) { console.error(err); return; }
+        if (err) { console.error("Cannot read file:", err); return; }
         let match = searchTerm.exec(data);
         if (match) {
           node.tree.emitter.emit("endPatternInPath", currentPath);