Move ProvideLanguageExtension and ProvideEditorExtension back to service

Author: Omar Tawfik

vsintegration/src/FSharp.Editor/CommonConstants.fs

@@ -12,10 +12,12 @@ module internal FSharpCommonConstants =
     [<Literal>]
     let languageServiceGuidString = "BC6DD5A5-D4D6-4dab-A00D-A51242DBAF1B"
     [<Literal>]
+    let editorFactoryGuidString = "4EB7CCB7-4336-4FFD-B12B-396E9FD079A9"
+    [<Literal>]
     let svsSettingsPersistenceManagerGuidString = "9B164E40-C3A2-4363-9BC5-EB4039DEF653"
     [<Literal>]
     let FSharpLanguageName = "F#"
     [<Literal>]
     let FSharpContentTypeName = "F#"
     [<Literal>]
-    let FSharpLanguageServiceCallbackName = "F# Language Service"
+    let FSharpLanguageServiceCallbackName = "F# Language Service"

vsintegration/src/FSharp.Editor/LanguageService.fs

@@ -30,6 +30,12 @@ open Microsoft.VisualStudio.FSharp.LanguageService
 type internal SVsSettingsPersistenceManager = class end
 
 [<Guid(FSharpCommonConstants.languageServiceGuidString)>]
+[<ProvideLanguageExtension(typeof<FSharpLanguageService>, ".fs")>]
+[<ProvideLanguageExtension(typeof<FSharpLanguageService>, ".fsi")>]
+[<ProvideLanguageExtension(typeof<FSharpLanguageService>, ".fsx")>]
+[<ProvideLanguageExtension(typeof<FSharpLanguageService>, ".fsscript")>]
+[<ProvideLanguageExtension(typeof<FSharpLanguageService>, ".ml")>]
+[<ProvideLanguageExtension(typeof<FSharpLanguageService>, ".mli")>]
 type internal FSharpLanguageService(package : FSharpPackage) = 
     inherit AbstractLanguageService<FSharpPackage, FSharpLanguageService>(package)
 
@@ -98,6 +104,12 @@ type internal FSharpLanguageService(package : FSharpPackage) =
         | _ -> ()
 
 and [<Guid(FSharpCommonConstants.packageGuidString)>]
+    [<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".fs", 97)>]
+    [<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".fsi", 97)>]
+    [<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".fsx", 97)>]
+    [<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".fsscript", 97)>]
+    [<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".ml", 97)>]
+    [<ProvideEditorExtension(FSharpCommonConstants.editorFactoryGuidString, ".mli", 97)>]
     internal FSharpPackage() = 
     inherit AbstractPackage<FSharpPackage, FSharpLanguageService>()
 

vsintegration/src/FSharp.ProjectSystem.FSharp/Project.fs

@@ -1595,7 +1595,7 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
                     // in the registry hive so that more editors can be added without changing this part of the
                     // code. FSharp only makes usage of one Editor Factory and therefore we will return 
                     // that guid
-                    guidEditorType <- GuidList.guidEditorFactory
+                    guidEditorType <- new Guid(FSharpCommonConstants.editorFactoryGuidString)
                     VSConstants.S_OK
 
             interface IVsProjectSpecificEditorMap2 with 
@@ -1609,7 +1609,7 @@ namespace rec Microsoft.VisualStudio.FSharp.ProjectSystem
                     // in the registry hive so that more editors can be added without changing this part of the
                     // code. FSharp only makes usage of one Editor Factory and therefore we will return 
                     // that guid
-                    guidEditorType <- GuidList.guidEditorFactory
+                    guidEditorType <- new Guid(FSharpCommonConstants.editorFactoryGuidString)
                     VSConstants.S_OK
 
                 member x.GetSpecificLanguageService(_mkDocument:string, guidLanguageService:byref<Guid> ) =

vsintegration/src/FSharp.ProjectSystem.FSharp/ProjectPrelude.fs

@@ -267,9 +267,6 @@ namespace Microsoft.VisualStudio.FSharp.ProjectSystem
     // Some more constants
 
     module internal GuidList =
-        let guidEditorFactory = new Guid("{4EB7CCB7-4336-4FFD-B12B-396E9FD079A9}")
-        [<Literal>]
-        let guidEditorFactoryString = "4EB7CCB7-4336-4FFD-B12B-396E9FD079A9"
         [<Literal>]
         let guidFSharpProjectPkgString = "91A04A73-4F2C-4E7C-AD38-C1A68E7DA05C"
         [<Literal>]