Skip to content

Commit

Permalink
Spellings (ionide#1182)
Browse files Browse the repository at this point in the history
* Fixing warnings in otel file

* fixing typos
  • Loading branch information
TheAngryByrd authored Oct 22, 2023
1 parent 07afb2f commit c6fd5c4
Show file tree
Hide file tree
Showing 43 changed files with 488 additions and 343 deletions.
153 changes: 149 additions & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,161 @@
//otherwise take a lot of time to load proj inside
//the test directories
"omnisharp.autoStart": false,
"FSharp.minimizeBackgroundParsing": true,
"FSharp.trace.server": "off",
"yaml.schemas": {
"https://raw.githubusercontent.com/SchemaStore/schemastore/master/src/schemas/json/github-workflow.json": ".github/workflows/*"
},
"editor.inlayHints.enabled": "offUnlessPressed",
"FSharp.enableAdaptiveLspServer": true,
"files.associations": {
"*.*proj": "msbuild",
"*.props": "msbuild",
"*.targets": "msbuild"
}
}
},
"cSpell.words": [
"abrv",
"Additionals",
"ancestorly",
"apos",
"Argu",
"aset",
"asyncaval",
"attachdebugger",
"autocompletions",
"aval",
"avals",
"baaaaaaaaaz",
"baaaaz",
"Backticked",
"BCL's",
"bimap",
"binlog",
"bitflags",
"bprintf",
"ccont",
"cdma",
"cexpr",
"Childs",
"classlib",
"Cloneable",
"cmap",
"codefix",
"colu",
"compilerlocation",
"compilertool",
"crefs",
"cset",
"cval",
"Debouncer",
"decompile",
"Decompiler",
"decompiling",
"Dont",
"dotm",
"dotnetaddproject",
"dotnetaddsln",
"dotnetnew",
"dotnetnewget",
"dotnetnewlist",
"dotnetnewrun",
"dotnetremoveproject",
"econt",
"ehrpd",
"enduser",
"eprintfn",
"evdo",
"Expecto",
"expl",
"failtest",
"Fantomas",
"fantomasignore",
"foldi",
"FSAC",
"fsautocomplete",
"Fsdn",
"Fsprojs",
"fsym",
"ftest",
"Funcs",
"GITSHA",
"gprs",
"Handleable",
"hsdpa",
"hspap",
"hsupa",
"iden",
"iface",
"ifaces",
"IFSAC",
"infinityf",
"Informations",
"inproc",
"insts",
"interoperating",
"ints",
"Ionide",
"iwlan",
"kprintf",
"langversion",
"linebreak",
"linebreaks",
"listheader",
"logfile",
"lpat",
"Msbuild",
"nanf",
"Neatherway",
"NETCORE",
"Newtonsoft",
"nlpos",
"nmax",
"normalised",
"nrnsa",
"nunit",
"objs",
"opentelemetry",
"otel",
"Otlp",
"Overriden",
"paket",
"parently",
"parms",
"Petricek",
"projs",
"promptable",
"ptest",
"quals",
"quickfix",
"Recalc",
"retn",
"Retrigger",
"revd",
"RPAREN",
"rpat",
"scdma",
"seealso",
"Sequentials",
"Serilog",
"Simplifiable",
"sketchfs",
"skiptest",
"Sourcelink",
"sourcelinked",
"SRTP",
"streamjsonrpc",
"subidx",
"Supertypes",
"Syms",
"Tablered",
"targetprofile",
"tbody",
"thead",
"threadpool",
"tracecontext",
"typeparamref",
"typesig",
"umts",
"whitespaces",
"xrtt",
"xunit"
]
}
2 changes: 1 addition & 1 deletion paket.dependencies
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ nuget Expecto.Diff
nuget YoloDev.Expecto.TestSdk
nuget AltCover
nuget GitHubActionsTestLogger
nuget Ionide.LanguageServerProtocol >= 0.4.16
nuget Ionide.LanguageServerProtocol >= 0.4.18
nuget Microsoft.Extensions.Caching.Memory
nuget OpenTelemetry.Api >= 1.3.2
nuget OpenTelemetry.Exporter.OpenTelemetryProtocol >= 1.3.2 # 1.4 bumps to 7.0 versions of System.Diagnostics libs, so can't use it
Expand Down
2 changes: 1 addition & 1 deletion paket.lock
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ NUGET
System.Collections.Immutable (>= 5.0)
System.Reflection.Metadata (>= 5.0)
Ionide.KeepAChangelog.Tasks (0.1.8) - copy_local: true
Ionide.LanguageServerProtocol (0.4.17)
Ionide.LanguageServerProtocol (0.4.18)
FSharp.Core (>= 6.0)
Newtonsoft.Json (>= 13.0.1)
StreamJsonRpc (>= 2.10.44)
Expand Down
2 changes: 1 addition & 1 deletion src/FsAutoComplete.Core/AbstractClassStubGenerator.fs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ type AbstractClassData =
| ExplicitImpl of
baseTy: SynType *
members: SynMemberDefn list *
/// the place where the inherit expression is declared - the codefix should insert
/// the place where the inherit expression is declared - the code-fix should insert
/// at an indent of .Start.Column, but insert a newline after .End
inheritExpressionRange: Range

Expand Down
6 changes: 3 additions & 3 deletions src/FsAutoComplete.Core/AdaptiveExtensions.fsi
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ module AsyncAVal =
val ofAVal: value: FSharp.Data.Adaptive.aval<'a> -> asyncaval<'a>

/// <summary>
/// Returns a new async adaptive value that adaptively applies the mapping fun tion to the given
/// Returns a new async adaptive value that adaptively applies the mapping function to the given
/// adaptive inputs.
/// </summary>
val map:
Expand All @@ -282,13 +282,13 @@ module AsyncAVal =
asyncaval<'b>

/// <summary>
/// Returns a new async adaptive value that adaptively applies the mapping fun tion to the given
/// Returns a new async adaptive value that adaptively applies the mapping function to the given
/// adaptive inputs.
/// </summary>
val mapAsync: mapping: ('a -> Async<'b>) -> input: asyncaval<'a> -> asyncaval<'b>

/// <summary>
/// Returns a new async adaptive value that adaptively applies the mapping fun tion to the given
/// Returns a new async adaptive value that adaptively applies the mapping function to the given
/// adaptive inputs.
/// </summary>
val mapSync: mapping: ('a -> System.Threading.CancellationToken -> 'b) -> input: asyncaval<'a> -> asyncaval<'b>
Expand Down
16 changes: 8 additions & 8 deletions src/FsAutoComplete.Core/CodeGeneration.fs
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ module CodeGenerationUtils =
{
Writer: ColumnIndentedTextWriter
/// Map generic types to specific instances for specialized interface implementation
TypeInstantations: Map<string, string>
TypeInstantiations: Map<string, string>
/// Data for interface instantiation
ArgInstantiations: (FSharpGenericParameter * FSharpType) seq
/// Indentation inside method bodies
Expand Down Expand Up @@ -162,7 +162,7 @@ module CodeGenerationUtils =
let genericDefinition =
typ.Instantiate(Seq.toList ctx.ArgInstantiations).Format(ctx.DisplayContext)

(genericDefinition, ctx.TypeInstantations)
(genericDefinition, ctx.TypeInstantiations)
||> Map.fold (fun s k v -> s.Replace(k, v))

let normalizeArgName (namesWithIndices: NamesWithIndices) nm =
Expand Down Expand Up @@ -336,7 +336,7 @@ module CodeGenerationUtils =
sprintf "(%s)" args),
namesWithIndices

let preprocess (ctx: Context) (v: FSharpMemberOrFunctionOrValue) =
let preProcess (ctx: Context) (v: FSharpMemberOrFunctionOrValue) =
let buildUsage argInfos =
let parArgs, _ = getParamArgs argInfos ctx v

Expand Down Expand Up @@ -394,10 +394,10 @@ module CodeGenerationUtils =

match m with
| MemberInfo.PropertyGetSet(getter, setter) ->
let (usage, modifiers, getterArgInfos, retType) = preprocess ctx getter
let (usage, modifiers, getterArgInfos, retType) = preProcess ctx getter
let closeDeclaration = closeDeclaration retType
let writeImplementation = writeImplementation ctx
let (_, _, setterArgInfos, _) = preprocess ctx setter
let (_, _, setterArgInfos, _) = preProcess ctx setter
let writer = ctx.Writer

writer.Write(memberPrefix getter)
Expand Down Expand Up @@ -438,7 +438,7 @@ module CodeGenerationUtils =
writer.Unindent ctx.Indentation

| MemberInfo.Member v ->
let (usage, modifiers, argInfos, retType) = preprocess ctx v
let (usage, modifiers, argInfos, retType) = preProcess ctx v
let closeDeclaration = closeDeclaration retType
let writeImplementation = writeImplementation ctx
let writer = ctx.Writer
Expand Down Expand Up @@ -541,7 +541,7 @@ module CodeGenerationUtils =
m.ImplementedAbstractSignatures <> null
&& m.ImplementedAbstractSignatures.Count = 0
with _ ->
true) // exceptions here trying to acces the member means we're safe
true) // exceptions here trying to access the member means we're safe
// this member is not an override
&& not m.IsOverrideOrExplicitInterfaceImplementation

Expand Down Expand Up @@ -713,7 +713,7 @@ module CodeGenerationUtils =

let ctx =
{ Writer = writer
TypeInstantations = instantiations
TypeInstantiations = instantiations
ArgInstantiations = Seq.empty
Indentation = indentation
ObjectIdent = objectIdent
Expand Down
2 changes: 1 addition & 1 deletion src/FsAutoComplete.Core/CodeGeneration.fsi
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ module CodeGenerationUtils =
{
Writer: ColumnIndentedTextWriter
/// Map generic types to specific instances for specialized interface implementation
TypeInstantations: Map<string, string>
TypeInstantiations: Map<string, string>
/// Data for interface instantiation
ArgInstantiations: (FSharpGenericParameter * FSharpType) seq
/// Indentation inside method bodies
Expand Down
6 changes: 3 additions & 3 deletions src/FsAutoComplete.Core/Commands.fs
Original file line number Diff line number Diff line change
Expand Up @@ -1104,7 +1104,7 @@ module Commands =

// TODO: LSP technically does now know how to handle overlapping, nested and multiline ranges, but
// as of 3 February 2021 there are no good examples of this that I've found, so we still do this
/// because LSP doesn't know how to handle overlapping/nested ranges, we have to dedupe them here
/// because LSP doesn't know how to handle overlapping/nested ranges, we have to de-dupe them here
let scrubRanges (highlights: SemanticClassificationItem array) : SemanticClassificationItem array =
let startToken =
fun (m: SemanticClassificationItem) -> m.Range.StartLine, m.Range.StartColumn
Expand Down Expand Up @@ -1139,14 +1139,14 @@ module Commands =



let analyzerHandler (file: string<LocalPath>, content, pt, tast, symbols, getAllEnts) =
let analyzerHandler (file: string<LocalPath>, content, pt, tast, symbols, getAllEntities) =
let ctx: SDK.Context =
{ FileName = UMX.untag file
Content = content
ParseTree = pt
TypedTree = tast
Symbols = symbols
GetAllEntities = getAllEnts }
GetAllEntities = getAllEntities }

let extractResultsFromAnalyzer (r: SDK.AnalysisResult) =
match r.Output with
Expand Down
2 changes: 1 addition & 1 deletion src/FsAutoComplete.Core/CompilerServiceInterface.fs
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ type FSharpCompilerServiceChecker(hasAnalyzers, typecheckCacheSize, parallelRefe
/// <summary>
/// This is use primary for Autocompletions. The problem with trying to use TryGetRecentCheckResultsForFile is that it will return None
/// if there isn't a GetHashCode that matches the SourceText passed in. This a problem particularly for Autocompletions because we'd have to wait for a typecheck
/// on every keystroke which can prove slow. For autocompletions, it's ok to rely on cached typechecks as files above generally don't change mid type.
/// on every keystroke which can prove slow. For autocompletions, it's ok to rely on cached type-checks as files above generally don't change mid type.
/// </summary>
/// <param name="file">The path of the file to get cached type check results for.</param>
/// <returns>Cached typecheck results</returns>
Expand Down
2 changes: 1 addition & 1 deletion src/FsAutoComplete.Core/CompilerServiceInterface.fsi
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ type FSharpCompilerServiceChecker =
/// <summary>
/// This is use primary for Autocompletions. The problem with trying to use TryGetRecentCheckResultsForFile is that it will return None
/// if there isn't a GetHashCode that matches the SourceText passed in. This a problem particularly for Autocompletions because we'd have to wait for a typecheck
/// on every keystroke which can prove slow. For autocompletions, it's ok to rely on cached typechecks as files above generally don't change mid type.
/// on every keystroke which can prove slow. For autocompletions, it's ok to rely on cached type-checks as files above generally don't change mid type.
/// </summary>
/// <param name="file">The path of the file to get cached type check results for.</param>
/// <returns>Cached typecheck results</returns>
Expand Down
12 changes: 6 additions & 6 deletions src/FsAutoComplete.Core/Debug.fs
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,12 @@ module Debug =
let measure name f =
let sw = Stopwatch.StartNew()
let r = f ()
let ellapsed = sw.ElapsedMilliseconds
let elapsed = sw.ElapsedMilliseconds

measureLogger.info (
Log.setMessage ("{name} took {ellapsed} ms")
Log.setMessage ("{name} took {elapsed} ms")
>> Log.addContextDestructured "name" name
>> Log.addContextDestructured "ellapsed" ellapsed
>> Log.addContextDestructured "elapsed" elapsed
)

r
Expand All @@ -37,12 +37,12 @@ module Debug =
async {
let sw = Stopwatch.StartNew()
let! r = f
let ellapsed = sw.ElapsedMilliseconds
let elapsed = sw.ElapsedMilliseconds

measureLogger.info (
Log.setMessage ("{name} took {ellapsed} ms")
Log.setMessage ("{name} took {elapsed} ms")
>> Log.addContextDestructured "name" name
>> Log.addContextDestructured "ellapsed" ellapsed
>> Log.addContextDestructured "elapsed" elapsed
)

return r
Expand Down
Loading

0 comments on commit c6fd5c4

Please sign in to comment.