From 7fa0b9d01bbf30159be51137b43787c49b7bed20 Mon Sep 17 00:00:00 2001 From: Eric Amodio Date: Wed, 14 Sep 2016 13:30:52 -0400 Subject: [PATCH] Fixes #5 - Finding first non-white-space fails sometimes --- src/gitCodeLensProvider.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gitCodeLensProvider.ts b/src/gitCodeLensProvider.ts index 0dc0773..1c5af75 100644 --- a/src/gitCodeLensProvider.ts +++ b/src/gitCodeLensProvider.ts @@ -3,6 +3,7 @@ import {CancellationToken, CodeLens, CodeLensProvider, commands, DocumentSelecto import {BuiltInCommands, Commands, DocumentSchemes, WorkspaceState} from './constants'; import GitProvider, {IGitBlame, IGitBlameLines, IGitCommit} from './gitProvider'; import * as moment from 'moment'; +import * as _ from 'lodash'; export class GitRecentChangeCodeLens extends CodeLens { constructor(private git: GitProvider, public fileName: string, public symbolKind: SymbolKind, public blameRange: Range, range: Range) { @@ -95,7 +96,11 @@ export default class GitCodeLensProvider implements CodeLensProvider { return; } - let startChar = line.text.search(`\\b${symbol.name}\\b`); //line.firstNonWhitespaceCharacterIndex; + let startChar = -1; + try { + startChar = line.text.search(`\\b${_.escapeRegExp(symbol.name)}\\b`); + } + catch (ex) { } if (startChar === -1) { startChar = line.firstNonWhitespaceCharacterIndex; } else {