From 37b48f0c81dd7b06aa09e432384f0e279f811630 Mon Sep 17 00:00:00 2001
From: Bati Sengul <batisengul@gmail.com>
Date: Thu, 21 Sep 2017 13:12:18 +0300
Subject: [PATCH] Revert "Enable \ref from any subfolders just like \cite"

---
 lib/label-view.coffee | 20 ++++++-----
 lib/list-labels.js    | 80 -------------------------------------------
 2 files changed, 12 insertions(+), 88 deletions(-)
 delete mode 100644 lib/list-labels.js

diff --git a/lib/label-view.coffee b/lib/label-view.coffee
index 27292f8..c840877 100644
--- a/lib/label-view.coffee
+++ b/lib/label-view.coffee
@@ -1,8 +1,6 @@
 {$,SelectListView} = require 'atom-space-pen-views'
 FindLabels = require './find-labels'
-ListLabels = require './list-labels'
 fs = require 'fs-plus'
-pathModule = require 'path'
 
 module.exports =
 class LabelView extends SelectListView
@@ -18,12 +16,18 @@ class LabelView extends SelectListView
     @editor = editor
     file = editor?.buffer?.file
     basePath = file?.path
-    activePaneItemPath = basePath
-    texRootRex = /%(\s+)?!TEX root(\s+)?=(\s+)?(.+)/g
+    texRootRex = /%!TEX root = (.+)/g
     while(match = texRootRex.exec(@editor.getText()))
-      absolutFilePath = FindLabels.getAbsolutePath(activePaneItemPath,match[4])
-      basePath = pathModule.dirname(absolutFilePath)
-      labels = ListLabels.fromDir(basePath, /\.tex$/);
+      absolutFilePath = FindLabels.getAbsolutePath(basePath,match[1])
+      try
+        text = fs.readFileSync(absolutFilePath).toString()
+        labels = FindLabels.getLabelsByText(text, absolutFilePath)
+      catch error
+        errmsg = 'could not load content of #{absolutFilePath}'
+        atom.notifications.addError(errmsg, { dismissable: true })
+        console.log(error)
+    if labels == undefined or labels.length == 0
+      labels = FindLabels.getLabelsByText(@editor.getText(), basePath)
     @setItems(labels)
     @panel ?= atom.workspace.addModalPanel(item: this)
     @panel.show()
@@ -40,7 +44,7 @@ class LabelView extends SelectListView
     "label"
 
   viewForItem: ({label}) ->
-     "<li>#{label}</li>"
+    "<li>#{label}</li>"
 
   confirmed: ({label}) ->
     @editor.insertText label
diff --git a/lib/list-labels.js b/lib/list-labels.js
deleted file mode 100644
index 25a6178..0000000
--- a/lib/list-labels.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
-let ListLabels;
-const fsPlus = require('fs-plus');
-const fs = require('fs-plus');
-const path = require('path');
-
-module.exports =
-(ListLabels = {
-   fromDir(startPath,filter){
-      allLabels = []
-       if (!fs.existsSync(startPath)){
-           console.log("no dir ",startPath);
-           return;
-       }
-
-       var files=fs.readdirSync(startPath);
-       for(var i=0;i<files.length;i++){
-           var filename=path.join(startPath,files[i]);
-           var stat = fs.lstatSync(filename);
-           if (stat.isDirectory()){
-              allLabels = allLabels.concat(this.fromDir(filename,filter));
-           }
-           else if (filter.test(filename)) {
-             text = fs.readFileSync(filename).toString()
-             labels = this.getLabelsByText(text, filename)
-              allLabels.push(labels);
-           }
-       };
-
-       labels = []
-       for (var i = 0; i < allLabels.length; i++) {
-          labels = labels.concat(allLabels[i])
-       }
-
-       return labels
-   },
-
-  getLabelsByText(text, file) {
-    let match;
-    if (file == null) { file = ""; }
-    const labelRex = /\\(?:th)?label{([^}]+)}/g;
-    let matches = [];
-    while (match = labelRex.exec(text)) {
-      matches.push({label: match[1]});
-    }
-    if (file == null) { return matches; }
-    const inputRex = /\\(input|include){([^}]+)}/g;
-    while (match = inputRex.exec(text)) {
-      matches = matches.concat(this.getLabels(this.getAbsolutePath(file, match[2])));
-    }
-    return matches;
-  },
-
-  getLabels(file) {
-    //if file is not there try add possible extensions
-    if (!fsPlus.isFileSync(file)) {
-      file = fsPlus.resolveExtension(file, ['tex']);
-    }
-    if (!fsPlus.isFileSync(file)) { return []; }
-    const text = fs.readFileSync(file).toString();
-    return this.getLabelsByText(text, file);
-  },
-
-  getAbsolutePath(file, relativePath) {
-    let ind;
-    if ((ind = file.lastIndexOf(path.sep)) !== file.length) {
-      file = file.substring(0,ind);
-    }
-    return path.resolve(file, relativePath);
-  }
-});
-
-// dir = '/Users/vitalis/Documents/Msc_project/bluSky/thesis/dissertation'
-// allFiles = ListLabels.fromDir(dir, /\.tex$/);
-// console.log(allFiles);