Merge pull request #172 from spasche/fix-headings-with-special-chars

Fix detection of links to headings with special characters

Author: spasche

CHANGELOG.md

@@ -1,18 +1,25 @@
+# 2.3.3
+
+- Fix: detection of links to headings with special characters. [#163](https://github.com/TfTHacker/obsidian42-strange-new-worlds/issues/163).
+
 # 2.3.2
+
 - Fix: When using editing toolbar configured for showing toolbar at top, the SNW reference counter overlapped. The CSS was mofiied to prevent this. [#155](https://github.com/TfTHacker/obsidian42-strange-new-worlds/issues/155).
 
 # 2.3.1
+
 - Change: if a link is the only link in the vault to a destination (thus the reference count is 1), the reference counter will not be shown next to the link, regardless of the minimum threshold count set in settings. This makes sense. If the link is used once, its obvious without the counter, and the counter simply stating the link has one reference was redudant and annoying to many users.
 
-# 2.3.0 
+# 2.3.0
+
 - New: Added support for references to show up in the kanban plugin. This can be toggled on and off in settings.
 - Changed: SNW's internal index did not include file extensions, which in some cases led to issues. the index now uses the full path with the extension, which means every file whether it is a MD file or not is included in the index.
 
 # 2.2.1
 
 - Reference count now appears in the files property subpan
 
-# 2.2.0 
+# 2.2.0
 
 - This is another major update to the indexing engine to avoid detecting certain reported issues.
 - Additional optimization efforts to improve performance. (removing loops, keeping index optimized)

DEV_NOTES.MD

@@ -2,7 +2,7 @@ DEV_NOTES.MD
 
 # Updating the version
 
-1. update pacakage.json version number
+1. update package.json version number
 2. npm run version (updates the manifest and version file)
 3. commit repo
 4. npm run githubaction (commits the version number tag to the repo and pushes it, which kicks of the github action to prepare the release)

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "obsidian42-strange-new-worlds",
 	"name": "Strange New Worlds",
-	"version": "2.3.2",
+	"version": "2.3.3",
 	"minAppVersion": "1.7.2",
 	"description": "Help see how your vault is interconnected with visual indicators.",
 	"author": "TfTHacker",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "obsidian42-strange-new-worlds",
-	"version": "2.3.2",
+	"version": "2.3.3",
 	"description": "Revealing networked thought and the strange new worlds created by your vault",
 	"scripts": {
 		"dev": "node --no-warnings esbuild.config.mjs",

src/indexer.ts

@@ -16,7 +16,17 @@ export function getIndexedReferences() {
 	return indexedReferences;
 }
 
-// Primary Indexing function. Adss to the indexedReferences map all outgoing links from a given file
+function parseLinkTextAndStripHeading(link: string): { path: string; subpath: string } {
+	let { path, subpath } = parseLinktext(link);
+	if (subpath.startsWith("#") && !subpath.startsWith("#^")) {
+		// subpath may link to a subheading (e.g. #parent#child). Keep the last subheading in this case.
+		subpath = subpath.substring(subpath.lastIndexOf('#'));
+		subpath = "#" + stripHeading(subpath);
+	}
+	return { path: path, subpath };
+}
+
+// Primary Indexing function. Adds to the indexedReferences map all outgoing links from a given file
 // The Database is primarily a key which is the link, and the value is an array of references that use that link
 export const getLinkReferencesForFile = (file: TFile, cache: CachedMetadata) => {
 	if (plugin.settings.enableIgnoreObsExcludeFoldersLinksFrom && file?.path && plugin.app.metadataCache.isUserIgnored(file?.path)) {
@@ -26,8 +36,8 @@ export const getLinkReferencesForFile = (file: TFile, cache: CachedMetadata) =>
 		if (!item) continue;
 		for (const ref of item) {
 			const { path, subpath } = ref.link.startsWith("#") // if link is pointing to itself, create a full path
-				? parseLinktext(file.path.replace(`.${file.extension}`, "") + ref.link)
-				: parseLinktext(ref.link);
+				? parseLinkTextAndStripHeading(file.path.replace(`.${file.extension}`, "") + ref.link)
+				: parseLinkTextAndStripHeading(ref.link);
 			const tfileDestination = plugin.app.metadataCache.getFirstLinkpathDest(path, "/");
 			if (tfileDestination) {
 				if (
@@ -123,7 +133,7 @@ export function getSNWCacheByFile(file: TFile): TransformedCache {
 	if (!indexedReferences) buildLinksAndReferences();
 
 	if (cachedMetaData?.headings) {
-		// filter - fFirst confirm there are references
+		// filter - first confirm there are references
 		// map - map to the transformed cache
 		const baseFilePath = `${filePathInUppercase}#`;
 		const tempCacheHeadings = cachedMetaData.headings
@@ -229,7 +239,7 @@ export function getSNWCacheByFile(file: TFile): TransformedCache {
 	}
 
 	if (cachedMetaData?.frontmatterLinks) {
-		// filter - fFirst confirm there are references
+		// filter - first confirm there are references
 		// map - map to the transformed cache
 		const tempCacheFrontmatter = cachedMetaData.frontmatterLinks
 			.filter((link) => indexedReferences.has(parseLinkTextToFullPath(link.link).toLocaleUpperCase() || link.link.toLocaleUpperCase()))
@@ -256,7 +266,7 @@ export function getSNWCacheByFile(file: TFile): TransformedCache {
 }
 
 export function parseLinkTextToFullPath(link: string): string {
-	const resolvedFilePath = parseLinktext(link);
+	const resolvedFilePath = parseLinkTextAndStripHeading(link);
 	const resolvedTFile = plugin.app.metadataCache.getFirstLinkpathDest(resolvedFilePath.path, "/");
 	if (resolvedTFile === null) return "";
 	return resolvedTFile.path + resolvedFilePath.subpath;

versions.json

@@ -15,5 +15,6 @@
 	"2.2.1": "1.7.2",
 	"2.3.0": "1.7.2",
 	"2.3.1": "1.7.2",
-	"2.3.2": "1.7.2"
+	"2.3.2": "1.7.2",
+	"2.3.3": "1.7.2"
 }