Assume relative DefaultBib path is from workspaceFolder

Author: notZaki

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Log
 
+## [0.7.0] - 2020-03-17
+
+- Remove support for `${workspaceFolder}` in bib path
+- If the path in `PandocCiter.DefaultBib` is relative, then it will be assumed that the path is relative to the workspaceFolder
+
 ## [0.6.0] - 2020-03-17
 
 - Support `${workspaceFolder}` in bib path (#13)

README.md

@@ -29,7 +29,7 @@ This extension provides autocompletion of citations stored in a bibtex file, for
     + Function: This is useful if there are multiple markdown files with one external master file containing the YAML header with the `bibliography: [path/to/bib]` entry. This avoids having to insert the bibliography YAML header into each individual file. 
 - `PandocCiter.DefaultBib`
     + Type: String, absolute or relative path to bib file
-        - Note: For relative paths, it will be assumed that the path is relative to the active document. If the path should be relative to the workspace folder, then use `${workspaceFolder}` in the configuration, e.g. `"PandocCiter.DefaultBib": "${workspaceFolder}/bibFolder/sources.bib"`
+        - Note: For relative paths, it will be assumed that the path is relative to the workspace folder
     + Function: This is useful if there is a default bib file that is preferred for all projects. This bib file will be loaded regardless of whether or not a YAML entry is included.
 - `PandocCiter.UseDefaultBib`
     + Type: Boolean, default is `true`

package-lock.json

@@ -2,7 +2,7 @@
     "name": "pandocciter",
     "displayName": "Pandoc Citer",
     "description": "Autocomplete bibtex citations for markdown/pandoc",
-    "version": "0.6.0",
+    "version": "0.7.0",
     "publisher": "notZaki",
     "license": "MIT",
     "engines": {

package.json

@@ -77,7 +77,7 @@ export class Manager {
         }
         if (configuration.get('UseDefaultBib') && (configuration.get('DefaultBib') !== "")) {
             let bibFile = path.join(configuration.get('DefaultBib'));
-            bibFile = this.resolveBibFile(bibFile);
+            bibFile = this.resolveBibFile(bibFile, true);
             this.extension.log(`Looking for .bib file: ${bibFile}`);
             this.addBibToWatcher(bibFile);
             foundFiles.push(bibFile);
@@ -99,11 +99,12 @@ export class Manager {
         }
     }
 
-    resolveBibFile(bibFile: string) {
-        bibFile = bibFile.replace("${workspaceFolder}",vscode.workspace.rootPath);
+    resolveBibFile(bibFile: string, useWorkspaceFolder?: boolean) {
         if (path.isAbsolute(bibFile)) {
             return bibFile;
-        } else { 
+        } else if (useWorkspaceFolder) { 
+            return path.resolve(vscode.workspace.rootPath, bibFile);
+        } else {
             return path.resolve(path.dirname(vscode.window.activeTextEditor!.document.fileName), bibFile);
         }
     }