Fixed duplicate line watcher default regex, added setting to include unchanged surrounding lines in watcher analysis

Author: Blakenator

package.json

@@ -1,6 +1,6 @@
 {
   "name": "light-git-client",
-  "version": "0.4.3",
+  "version": "0.4.4",
   "description": "A light git client",
   "author": {
     "name": "Blake Stacks",

shared/SettingsModel.ts

@@ -1,7 +1,7 @@
 import {CodeWatcherModel} from './code-watcher.model';
 
 const defaultCodeWatchers: CodeWatcherModel[] = [
-  new CodeWatcherModel('Duplicate Lines', '^(.*)(\\r?\\n\\1)+$', 'g'),
+  new CodeWatcherModel('Duplicate Lines', '(^|\\n)(.*)(\\r?\\n\\2(\\r?\\n|$))+', 'g'),
   new CodeWatcherModel('Console Output', 'console\\.(log|error|info)', 'g', '\\.(ts|js|jsx)'),
 ];
 
@@ -19,6 +19,7 @@ export class SettingsModel {
   public expandStates: { [key: string]: boolean };
   public commandTimeoutSeconds: number;
   public codeWatchers: CodeWatcherModel[];
+  public includeUnchangedInWatcherAnalysis: boolean;
 
   constructor(darkMode: boolean = false,
               openRepos: string[] = [''],
@@ -32,6 +33,7 @@ export class SettingsModel {
               showTrackingPath: boolean = false,
               commitMessageAutcomplete: boolean = false,
               diffIgnoreWhitespace: boolean = false,
+              includeUnchangedInWatcherAnalysis: boolean = true,
               codeWatchers: CodeWatcherModel[] = defaultCodeWatchers) {
     this.darkMode = darkMode;
     this.openRepos = openRepos;
@@ -46,6 +48,7 @@ export class SettingsModel {
     this.diffIgnoreWhitespace = diffIgnoreWhitespace;
     this.mergetool = mergetool;
     this.codeWatchers = codeWatchers;
+    this.includeUnchangedInWatcherAnalysis = includeUnchangedInWatcherAnalysis;
   }
 
   static sanitizePath(path) {
@@ -67,6 +70,7 @@ export class SettingsModel {
     res.commitMessageAutocomplete = this.commitMessageAutocomplete;
     res.diffIgnoreWhitespace = this.diffIgnoreWhitespace;
     res.mergetool = this.mergetool;
+    res.includeUnchangedInWatcherAnalysis = this.includeUnchangedInWatcherAnalysis;
     return res;
   }
 }

src/app/components/code-watcher-alerts/code-watcher-alerts.component.ts

@@ -43,8 +43,11 @@ export class CodeWatcherAlertsComponent implements OnInit {
             return {
               file: x.toFilename,
               hunks: x.hunks.map(h => {
-                // TODO: decide whether or not to include only changed lines or surrounding lines too
-                return {hunk: h, code: h.lines.filter(l => l.state != LineState.REMOVED).map(l => l.text).join('\n')};
+                if (this.settingsService.settings.includeUnchangedInWatcherAnalysis) {
+                  return {hunk: h, code: h.lines.filter(l => l.state != LineState.REMOVED).map(l => l.text).join('\n')};
+                } else {
+                  return {hunk: h, code: h.lines.filter(l => l.state == LineState.ADDED).map(l => l.text).join('\n')};
+                }
               })
             };
           });

src/app/components/settings/settings.component.html

@@ -69,6 +69,12 @@ <h5 class="modal-title">Settings</h5>
         </div>
         <div *ngIf="currentTab==1">
           <p>Watch your code changes for specified patterns, and alert you before you commit</p>
+          <div class="pretty p-switch p-fill mb-1 d-block">
+            <input type="checkbox" [(ngModel)]="tempSettings.includeUnchangedInWatcherAnalysis"/>
+            <div class="state">
+              <label>Include Unchanged Surrounding Code in Analysis</label>
+            </div>
+          </div>
           <table class="table table-striped">
             <thead>
             <tr>