Merge remote-tracking branch 'origin/master' into mono-2019-06mono-2019-06

4 files changed, 11 insertions, 8 deletions

diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FilePath.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FilePath.cs
index d4cc903875..c0e4238cb8 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FilePath.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Core/FilePath.cs
@@ -153,7 +153,7 @@ namespace MonoDevelop.Core
 		public bool HasExtension (string extension)
 		{
 			return fileName.Length > extension.Length
-				&& fileName.EndsWith (extension, StringComparison.OrdinalIgnoreCase)
+				&& fileName.EndsWith (extension, PathComparison)
 				&& fileName[fileName.Length - extension.Length - 1] != Path.PathSeparator;
 		}

 

diff --git a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
index d9e7a1960e..416c0a84af 100644
--- a/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
+++ b/main/src/core/MonoDevelop.Core/MonoDevelop.Projects/ProjectFile.cs
@@ -534,13 +534,10 @@ namespace MonoDevelop.Projects
 				Project.NotifyFilePropertyChangedInProject (this, property);
 		}
 
-		public virtual SourceCodeKind SourceCodeKind {  
-			get {
-				if (filename.Extension == ".sketchcs" || filename.Extension == ".sketchvb")
-					return SourceCodeKind.Script;
-				return SourceCodeKind.Regular;
-			}
-		}
+		public virtual SourceCodeKind SourceCodeKind
+			=> filename.HasExtension (".csx") || filename.HasExtension (".vbx")
+				? SourceCodeKind.Script
+				: SourceCodeKind.Regular;
 	}
 
 	class ProjectFileVirtualPathChangedEventArgs : EventArgs
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageService.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageService.cs
index 8699251b76..dd003cab69 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageService.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.WelcomePage/WelcomePageService.cs
@@ -51,6 +51,8 @@ namespace MonoDevelop.Ide.WelcomePage
 
 		public static event EventHandler WelcomePageShown;
 		public static event EventHandler WelcomePageHidden;
+		public static event EventHandler WelcomeWindowShown;
+		public static event EventHandler WelcomeWindowHidden;
 
 		internal static async Task Initialize (bool hideWelcomePage)
 		{
@@ -116,6 +118,7 @@ namespace MonoDevelop.Ide.WelcomePage
 		{
 			if (WelcomeWindowProvider != null) {
 				await WelcomeWindowProvider.HideWindow ();
+				WelcomeWindowHidden?.Invoke (WelcomeWindow, EventArgs.Empty);
 			} else {
 				HideWelcomePage (true);
 			}
@@ -164,6 +167,8 @@ namespace MonoDevelop.Ide.WelcomePage
 			await WelcomeWindowProvider.ShowWindow (options);
 			visible = true;
 
+			WelcomeWindowShown?.Invoke (WelcomeWindow, EventArgs.Empty);
+
 			return true;
 		}
 	}
diff --git a/main/tests/MonoDevelop.Core.Tests/MonoDevelop.Core/FilePathTests.cs b/main/tests/MonoDevelop.Core.Tests/MonoDevelop.Core/FilePathTests.cs
index 054ce5a4a8..6d3bad23c5 100644
--- a/main/tests/MonoDevelop.Core.Tests/MonoDevelop.Core/FilePathTests.cs
+++ b/main/tests/MonoDevelop.Core.Tests/MonoDevelop.Core/FilePathTests.cs
@@ -117,6 +117,7 @@ namespace MonoDevelop.Core
 			var path = new FilePath ("asdf.txt");
 			Assert.AreEqual ("asdf.txt", path.FileName);
 			Assert.IsTrue (path.HasExtension (".txt"));
+			Assert.AreEqual (FilePath.PathComparison == StringComparison.OrdinalIgnoreCase, path.HasExtension (".TXT"));
 			Assert.AreEqual (".txt", path.Extension);
 			Assert.AreEqual ("asdf", path.FileNameWithoutExtension);