Fixed: Bug evaluated file extensions with leading dot leading to issues

Author: Savas Ziplies

MarkdownViewerPlusPlus/Forms/AbstractRenderer.cs

@@ -138,7 +138,7 @@ public virtual void Render(string text, string fileName = "")
         /// <param name="e"></param>
         protected void refreshToolStripMenuItem_Click(object sender, EventArgs e)
         {
-            this.markdownViewer.UpdateMarkdownViewer();
+            this.markdownViewer.Update();
         }
 
         /// <summary>

MarkdownViewerPlusPlus/Forms/MarkdownViewerOptions.cs

@@ -111,7 +111,7 @@ private void btnOptionsSave_Click(object sender, System.EventArgs e)
             //Fire the save event for all listeners
             this.SaveEvent(ref this.configuration.options);
             //Save to init
-            this.configuration.Save();
+            this.configuration.Save();            
             //Close the options dialog when all has been done
             this.Close();
         }

MarkdownViewerPlusPlus/MarkdownViewer.cs

@@ -122,8 +122,7 @@ public void OnNotification(ScNotification notification)
                     //Update the scintilla handle in all cases to keep track of which instance is active
                     UpdateEditorInformation();
                     this.Editor.CurrentBufferID = notification.Header.IdFrom;
-                    this.updateRenderer = true;
-                    Update(true);
+                    Update(true, true);
                 }
                 else if (notification.Header.Code == (uint)SciMsg.SCN_MODIFIED && !this.updateRenderer)
                 {
@@ -140,12 +139,14 @@ public void OnNotification(ScNotification notification)
         /// 
         /// </summary>
         /// <param name="updateScrollBar"></param>
-        protected void Update(bool updateScrollBar = false)
+        /// <param name="updateRenderer"></param>
+        public void Update(bool updateScrollBar = false, bool updateRenderer = false)
         {
             //Validate that the current file may be rendered
             if (this.configuration.ValidateFileExtension(this.currentFileExtension, this.currentFileName))
             {
                 //Update the view
+                this.updateRenderer = updateRenderer ? updateRenderer : this.updateRenderer;
                 UpdateMarkdownViewer();
                 //Update the scroll bar of the Viewer Panel only in case of vertical scrolls
                 if (this.configuration.options.synchronizeScrolling && updateScrollBar)
@@ -158,7 +159,7 @@ protected void Update(bool updateScrollBar = false)
                 this.renderer.Render($@"<p>
 Your configuration settings do not include the currently selected file extension.<br />
 The rendered file extensions are <b>'{this.configuration.options.fileExtensions}'</b>.<br />
-The current file is <i>'{this.currentFileName}'</i>. {this.Editor.GetModify()}
+The current file is <i>'{this.currentFileName}'</i>.
                 </p>");
             }
         }
@@ -203,6 +204,8 @@ private void OptionsCommand()
             {
                 options.ShowDialog(Control.FromHandle(PluginBase.GetCurrentScintilla()));
             }
+            //Update after something potentially changed in the settings dialog
+            Update(true, true);
         }
 
         /// <summary>
@@ -251,8 +254,7 @@ public void MarkdownViewerCommand()
             if (!this.renderer.Visible)
             {
                 UpdateEditorInformation();
-                this.updateRenderer = true;
-                Update(true);
+                Update(true, true);
             }
             ToggleToolbarIcon(!this.renderer.Visible);
         }
@@ -265,6 +267,7 @@ protected void UpdateEditorInformation()
             this.Editor.SetScintillaHandle(PluginBase.GetCurrentScintilla());
             this.currentFileName = this.Notepad.GetCurrentFileName();
             this.currentFileExtension = Path.GetExtension(this.currentFileName);
+            this.currentFileExtension = this.currentFileExtension.StartsWith(".") ? this.currentFileExtension.Substring(1, this.currentFileExtension.Length-1) : this.currentFileExtension;
         }
 
         /// <summary>
@@ -286,7 +289,7 @@ public void ToggleToolbarIcon(bool show = true)
         /// <summary>
         /// 
         /// </summary>
-        public void UpdateMarkdownViewer()
+        protected void UpdateMarkdownViewer()
         {
             try
             {

MarkdownViewerPlusPlus/MarkdownViewerConfiguration.cs

@@ -172,8 +172,8 @@ public bool ValidateFileExtension(string fileExtension, string fileName = "")
             if (this.options.fileExtensions == null || this.options.fileExtensions == "") return true;
             //Something set but nothing given, check for "new " files (dirty dirty ^^)
             if (fileExtension == null || fileExtension == "") return this.options.inclNewFiles && fileName.StartsWith("new ");
-            //Otherwise check
-            return this.options.fileExtensions.Contains(fileExtension);
+            //Otherwise check            
+            return this.options.fileExtensions.ToLower().Contains(fileExtension.ToLower());
         }
 
         /// <summary>

MarkdownViewerPlusPlus/Properties/AssemblyInfo.cs

@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.0.*")]
-[assembly: AssemblyFileVersion("0.5.0.0")]
+[assembly: AssemblyVersion("0.5.1.*")]
+[assembly: AssemblyFileVersion("0.5.1.0")]

README.md

@@ -19,12 +19,12 @@ A Notepad++ Plugin to view a Markdown file rendered on-the-fly
 * BugFixes ^^'
 
 ## Latest Versions
+* 0.5.1
+  * Fixed a bug always returning false while checking file extensions
 * 0.5.0
   * Added an options dialog for file extensions, HTML CSS and PDF attributes
 * 0.4.5
   * Fixed handling rendering Markdown in either editor view (thanks to dail8859)
-* 0.4.4
-  * Update renderer scrolling when caret causes a scroll event (thanks to dail8859)
 
 Download the latest [release here][9]. For a full version history go [here][10].