Skip to content

Commit ca59816

Browse files
committed
Cleanup: trailing spaces
1 parent 3c4f847 commit ca59816

File tree

169 files changed

+413
-413
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

169 files changed

+413
-413
lines changed

ReSharper.FSharp/src/FSharp.Common/src/Checker/FSharpAssemblyContentProvider.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ type FSharpAssemblyContentProvider(lifetime, onSolutionCloseNotifier: OnSolution
2929
|> Seq.toList
3030
|> List.rev // if mscorlib.dll is the first then FSC raises exception when we try to
3131
// get Content.Entities from it.
32-
32+
3333
for fileName, signatures in assembliesByFileName do
3434
yield! AssemblyContent.GetAssemblyContent entityCache.Locking AssemblyContentType.Public fileName signatures ]
3535
}

ReSharper.FSharp/src/FSharp.Common/src/Checker/FSharpCoreFix.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ let private tryFindFile dirs file =
3232
| _ -> "")
3333
|> Seq.filter ((<>) "")
3434
|> Seq.cache
35-
if not (Seq.isEmpty files) then Some(Seq.head files)
35+
if not (Seq.isEmpty files) then Some(Seq.head files)
3636
else None
3737

3838
let fsharpCoreOpt =

ReSharper.FSharp/src/FSharp.Common/src/Checker/FcsCheckerService.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ type FcsCheckerService(lifetime: Lifetime, logger: ILogger, onSolutionCloseNotif
180180
x.ResolveNameAtLocation(context.GetSourceFile(), List.ofSeq names, coords, opName)
181181

182182

183-
type FSharpParseAndCheckResults =
183+
type FSharpParseAndCheckResults =
184184
{ ParseResults: FSharpParseFileResults
185185
CheckResults: FSharpCheckFileResults }
186186

ReSharper.FSharp/src/FSharp.Common/src/Checker/FcsProjectBuilder.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ type FcsProjectBuilder(checkerService: FcsCheckerService, itemsContainer: IFShar
208208
not (hasFSharpCoreReference options || options.OtherOptions |> Array.contains "--compiling-fslib")
209209

210210
let options =
211-
if shouldAddFSharpCore projectOptions then
211+
if shouldAddFSharpCore projectOptions then
212212
{ projectOptions with
213213
OtherOptions = FSharpCoreFix.ensureCorrectFSharpCore projectOptions.OtherOptions }
214214
else projectOptions

ReSharper.FSharp/src/FSharp.Common/src/Checker/FcsProjectProvider.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ open JetBrains.Util
2929
[<AutoOpen>]
3030
module FcsProjectProvider =
3131
let isProjectModule (psiModule: IPsiModule) =
32-
psiModule :? IProjectPsiModule
32+
psiModule :? IProjectPsiModule
3333

3434
let isMiscModule (psiModule: IPsiModule) =
3535
psiModule.IsMiscFilesProjectModule()
@@ -179,7 +179,7 @@ type FcsProjectProvider(lifetime: Lifetime, solution: ISolution, changeManager:
179179
getOrCreateFcsProject sourceFile.PsiModule
180180

181181
let isScriptLike file =
182-
fsFileService.IsScriptLike(file) || isMiscModule file.PsiModule || isNull (file.GetProject())
182+
fsFileService.IsScriptLike(file) || isMiscModule file.PsiModule || isNull (file.GetProject())
183183

184184
let getParsingOptionsForSingleFile ([<NotNull>] sourceFile: IPsiSourceFile) isScript =
185185
{ FSharpParsingOptions.Default with
@@ -190,7 +190,7 @@ type FcsProjectProvider(lifetime: Lifetime, solution: ISolution, changeManager:
190190
let invalidateProject (project: IProject) =
191191
for psiModule in psiModules.GetPsiModules(project) do
192192
dirtyModules.Add(psiModule) |> ignore
193-
193+
194194
member x.FcsProjectInvalidated = fcsProjectInvalidated
195195

196196
member x.ProcessChange(obj: ChangeEventArgs) =
@@ -295,7 +295,7 @@ type FcsProjectProvider(lifetime: Lifetime, solution: ISolution, changeManager:
295295
let path = sourceFile.GetLocation()
296296
tryGetValue path fsProject.FileIndices)
297297
|> Option.defaultWith (fun _ -> -1)
298-
298+
299299
member x.ModuleInvalidated = x.FcsProjectInvalidated :> _
300300

301301
member x.InvalidateReferencesToProject(project: IProject) =

ReSharper.FSharp/src/FSharp.Common/src/ProjectModel/FSharpLanguageLevelProvider.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ type FSharpLanguageLevelProjectProperty(lifetime, locks, projectPropertiesListen
4848

4949
let getFSharpProjectConfiguration (project: IProject) targetFrameworkId =
5050
project.ProjectProperties.TryGetConfiguration<IFSharpProjectConfiguration>(targetFrameworkId)
51-
51+
5252
let (|Version|) (version: Version) =
5353
version.Major, version.Minor
5454

@@ -66,7 +66,7 @@ type FSharpLanguageLevelProjectProperty(lifetime, locks, projectPropertiesListen
6666
let getVersionMappingByToolset () =
6767
let languageLevel = getLanguageLevelByToolsetVersion ()
6868
VersionMapping(languageLevel, languageLevel)
69-
69+
7070
// todo: more versions
7171
let getLanguageLevelByCompilerVersion (fscVersion: Version): VersionMapping =
7272
match fscVersion with

ReSharper.FSharp/src/FSharp.Common/src/ProjectModel/FSharpLanguageVersion.fs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type FSharpLanguageLevel =
1515
/// Anon records
1616
| FSharp46 = 46
1717

18-
/// Implicit yield, wild pat self id, constructor/static method parameters deindent
18+
/// Implicit yield, wild pat self id, constructor/static method parameters deindent
1919
| FSharp47 = 47
2020

2121
/// String interpolation, nameof, open types
@@ -57,7 +57,7 @@ module FSharpLanguageLevel =
5757
let key = Key<Boxed<FSharpLanguageLevel>>("LanguageLevel")
5858

5959
let private ofPsiModuleNoCache (psiModule: IPsiModule) =
60-
let levelProvider =
60+
let levelProvider =
6161
psiModule.GetPsiServices()
6262
.GetComponent<SolutionFeaturePartsContainer>()
6363
.GetFeatureParts<ILanguageLevelProvider<FSharpLanguageLevel, FSharpLanguageVersion>>(fun p ->
@@ -86,8 +86,8 @@ module FSharpLanguageVersion =
8686

8787
match langVersion with
8888
| IgnoreCase "Default" -> FSharpLanguageVersion.Default
89-
| IgnoreCase "LatestMajor" -> FSharpLanguageVersion.LatestMajor
90-
| IgnoreCase "Latest" -> FSharpLanguageVersion.Latest
89+
| IgnoreCase "LatestMajor" -> FSharpLanguageVersion.LatestMajor
90+
| IgnoreCase "Latest" -> FSharpLanguageVersion.Latest
9191
| IgnoreCase "Preview" -> FSharpLanguageVersion.Preview
9292

9393
| "4.6" -> FSharpLanguageVersion.FSharp46

ReSharper.FSharp/src/FSharp.Common/src/ProjectModel/FSharpScriptPsiModuleFactory.fs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -266,13 +266,13 @@ type FSharpScriptPsiModulesProvider(lifetime: Lifetime, solution: ISolution, cha
266266
removePsiModule psiModule
267267

268268
psiModule.LifetimeDefinition.Terminate()
269-
let changeBuilder = PsiModuleChangeBuilder()
269+
let changeBuilder = PsiModuleChangeBuilder()
270270
changeBuilder.AddModuleChange(psiModule, PsiModuleChange.ChangeType.Removed)
271271
changeBuilder.AddFileChange(psiModule.SourceFile, PsiModuleChange.ChangeType.Removed)
272272
changeManager.OnProviderChanged(this, changeBuilder.Result, SimpleTaskExecutor.Instance))
273273

274274
member x.GetPsiModulesForPath(path) =
275-
getPsiModulesForPath path
275+
getPsiModulesForPath path
276276

277277
member x.TargetFrameworkId =
278278
targetFrameworkId
@@ -283,7 +283,7 @@ type FSharpScriptPsiModulesProvider(lifetime: Lifetime, solution: ISolution, cha
283283
| null -> ()
284284
| change ->
285285
let path = change.ProjectFile.Location
286-
if scriptsReferences.ContainsKey(path) then
286+
if scriptsReferences.ContainsKey(path) then
287287
updateReferences path change.Document
288288

289289
member x.Dump(writer: TextWriter) =
@@ -308,7 +308,7 @@ type FSharpScriptPsiModulesProvider(lifetime: Lifetime, solution: ISolution, cha
308308
member x.Execute _ = null
309309

310310

311-
/// Overriding psi module handler for each project (a real project, misc files project, solution folder, etc).
311+
/// Overriding psi module handler for each project (a real project, misc files project, solution folder, etc).
312312
type FSharpScriptPsiModuleHandler(lifetime, solution, handler, modulesProvider, changeManager) as this =
313313
inherit DelegatingProjectPsiModuleHandler(handler)
314314

@@ -342,7 +342,7 @@ type FSharpScriptPsiModuleHandler(lifetime, solution, handler, modulesProvider,
342342
| _ -> handler.OnProjectFileChanged(projectFile, oldLocation, changeType, changeBuilder)
343343

344344
override x.GetPsiSourceFilesFor(projectFile) =
345-
let defaultSourceFiles = handler.GetPsiSourceFilesFor(projectFile)
345+
let defaultSourceFiles = handler.GetPsiSourceFilesFor(projectFile)
346346

347347
let mutable sourceFile = Unchecked.defaultof<IPsiSourceFile>
348348
match sourceFiles.TryGetValue(projectFile.Location, &sourceFile) with
@@ -351,7 +351,7 @@ type FSharpScriptPsiModuleHandler(lifetime, solution, handler, modulesProvider,
351351
yield sourceFile
352352
yield! defaultSourceFiles
353353
}
354-
| _ -> defaultSourceFiles
354+
| _ -> defaultSourceFiles
355355

356356
override x.InternalsVisibleTo(moduleTo, moduleFrom) =
357357
moduleTo :? FSharpScriptPsiModule && moduleFrom :? FSharpScriptPsiModule ||
@@ -363,7 +363,7 @@ type FSharpScriptPsiModule(lifetime, path, solution, sourceFileCtor, moduleId, a
363363
inherit ConcurrentUserDataHolder()
364364

365365
let lifetimeDefinition = Lifetime.Define(lifetime)
366-
let lifetime = lifetimeDefinition.Lifetime
366+
let lifetime = lifetimeDefinition.Lifetime
367367

368368
let psiServices = solution.GetPsiServices()
369369
let psiModules = solution.PsiModules()

ReSharper.FSharp/src/FSharp.Common/src/ProjectModel/Host/FSharpLanguageSpecificItemsProvider.fs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ type FSharpProjectPropertiesBuilder(projectPropertiesRequests) =
3333
base.BuildProjectConfiguration(rdProjectDescriptor, project, configuration)
3434

3535
let languageVersion = project.GetPropertyValueIgnoreCase(MSBuildProjectUtil.LanguageVersionProperty)
36-
let languageVersion = FSharpLanguageVersion.parseCompilationOption languageVersion
36+
let languageVersion = FSharpLanguageVersion.parseCompilationOption languageVersion
3737

3838
let configuration = configuration.As<IFSharpProjectConfiguration>()
39-
configuration.LanguageVersion <- languageVersion
39+
configuration.LanguageVersion <- languageVersion
4040

4141

4242
[<SolutionComponent>]

ReSharper.FSharp/src/FSharp.Common/src/ProjectModel/Host/ProjectItems/FSharpItemsContainer.fs

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ type FSharpItemsContainer(logger: ILogger, containerLoader: FSharpItemsContainer
216216
itemsByName.AddValue(rdItem.EvaluatedInclude, rdItem.ItemType)
217217

218218
let compileBeforeItems = getItems msBuildProject projectDescriptor isCompileBefore itemsByName true
219-
let compileAfterItems = getItems msBuildProject projectDescriptor isCompileAfter itemsByName true
219+
let compileAfterItems = getItems msBuildProject projectDescriptor isCompileAfter itemsByName true
220220
let restItems = getItems msBuildProject projectDescriptor (changesOrder >> not) itemsByName false
221221
let items =
222222
compileBeforeItems.Concat(restItems).Concat(compileAfterItems)
@@ -306,7 +306,7 @@ type FSharpItemsContainer(logger: ILogger, containerLoader: FSharpItemsContainer
306306
member x.TryGetParentFolderIdentity(viewFile: FSharpViewItem): FSharpViewFolderIdentity option =
307307
use lock = locker.UsingReadLock()
308308
tryGetProjectMark viewFile.ProjectItem
309-
|> Option.bind tryGetProjectMapping
309+
|> Option.bind tryGetProjectMapping
310310
|> Option.bind (fun mapping ->
311311
mapping.TryGetProjectItem(viewFile)
312312
|> Option.bind (fun item ->
@@ -356,10 +356,10 @@ type ProjectMapping(projectDirectory, projectUniqueName, targetFrameworkIds: ISe
356356

357357
let addChild (item: FSharpProjectItem) =
358358
children.AddValue(item.Parent, item)
359-
359+
360360
let removeChild (item: FSharpProjectItem) =
361361
children.RemoveValue(item.Parent, item)
362-
362+
363363
let tryGetFile path =
364364
tryGetValue path files
365365

@@ -498,7 +498,7 @@ type ProjectMapping(projectDirectory, projectUniqueName, targetFrameworkIds: ISe
498498
relativeParent, secondRelativeParent.LogicalPath
499499
| _ -> failwith "item parent"
500500
splitFolder relativeItemParent secondRelativeItemParentPath sortKey itemsUpdater
501-
501+
502502
let relativeParent, relativeItem =
503503
match relativeItem.Parent with
504504
| ProjectItem item -> item.Parent, item
@@ -532,7 +532,7 @@ type ProjectMapping(projectDirectory, projectUniqueName, targetFrameworkIds: ISe
532532
| RelativeToType.After
533533
| RelativeToType.Inside -> Seq.tryLast children
534534
| _ -> relativeToType |> failwithf "Got relativeToType %O"
535-
535+
536536
match relativeChildItem with
537537
| Some item when canBeRelative item modifiedItem -> Some (item, relativeToType)
538538
| Some item -> tryGetRelativeChildItem (ProjectItem item) modifiedItem relativeToType
@@ -626,7 +626,7 @@ type ProjectMapping(projectDirectory, projectUniqueName, targetFrameworkIds: ISe
626626
folders.RemoveValue(itemAfter.PhysicalPath, itemAfter)
627627
children.RemoveKey(ProjectItem itemAfter)
628628
removeChild itemAfter
629-
629+
630630
moveFollowingItems itemAfter.Parent itemAfter.SortKey MoveDirection.Up itemUpdater
631631

632632
let lastChildBefore = List.tryLast folderBeforeChildren
@@ -866,7 +866,7 @@ type ProjectMapping(projectDirectory, projectUniqueName, targetFrameworkIds: ISe
866866
addChild newItem
867867

868868
if oldLocation <> newLocation then
869-
// renaming linked files isn't currently supported, but
869+
// renaming linked files isn't currently supported, but
870870
info.LogicalPath <- info.LogicalPath.Directory / newLocation.Name
871871
info.PhysicalPath <- info.PhysicalPath.Directory / newLocation.Name
872872
| item -> failwithf "got item %O" item
@@ -926,7 +926,7 @@ type ProjectMapping(projectDirectory, projectUniqueName, targetFrameworkIds: ISe
926926
match tryGetAdjacentRelativeItem (ProjectItem relativeChildItem) modifiedItemBuildAction relativeToType with
927927
| Some (adjacentItem, relativeToType) ->
928928
Some (adjacentItem.PhysicalPath, changeDirection relativeToType)
929-
| _ ->
929+
| _ ->
930930
// There were no adjacent items in this direction, try the other one.
931931
let relativeToType = changeDirection relativeToType
932932
tryGetAdjacentRelativeItem (ProjectItem relativeChildItem) modifiedItemBuildAction relativeToType
@@ -981,7 +981,7 @@ type FSharpProjectModelElement =
981981
[<StructuredFormatDisplay("{RelativePhysicalPath}")>]
982982
type FSharpProjectItem =
983983
| FileItem of ItemInfo * BuildAction * ISet<TargetFrameworkId> * isThisProjectItem: bool
984-
| FolderItem of ItemInfo * FSharpViewFolderIdentity
984+
| FolderItem of ItemInfo * FSharpViewFolderIdentity
985985

986986
member x.ItemInfo =
987987
match x with
@@ -1001,7 +1001,7 @@ type FSharpProjectItem =
10011001
match x with
10021002
| FileItem(_, _, _, isThisProjectItem) -> not isThisProjectItem
10031003
| _ -> false
1004-
1004+
10051005
override x.ToString() =
10061006
let name =
10071007
match x with
@@ -1110,8 +1110,8 @@ type FSharpItemsContainerRefresher(lifetime: Lifetime, solution: ISolution, view
11101110

11111111
// todo: single identity
11121112
member x.RefreshFolder(projectMark, folder, _) =
1113-
refresh projectMark (fun project -> project.FindProjectItemsByLocation(folder).OfType<IProjectFolder>())
1114-
1113+
refresh projectMark (fun project -> project.FindProjectItemsByLocation(folder).OfType<IProjectFolder>())
1114+
11151115
member x.UpdateFile(projectMark, path) =
11161116
update projectMark path (function
11171117
| ProjectFile file -> Some(FSharpViewFile(file))
@@ -1240,6 +1240,6 @@ type FSharpBuildActionsProvider() =
12401240
let buildActions =
12411241
[| BuildActions.compileBefore
12421242
BuildActions.compileAfter |]
1243-
1243+
12441244
override x.DefaultBuildActions = buildActions :> _
12451245
override x.IsApplicable(projectProperties) = projectProperties :? FSharpProjectProperties

0 commit comments

Comments
 (0)