Skip to content

Commit 27011c9

Browse files
committed
Fixed typos
1 parent 54da645 commit 27011c9

File tree

2 files changed

+14
-14
lines changed

2 files changed

+14
-14
lines changed

Diff for: ls/builder.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ func (r *SketchRebuilder) doRebuild(ctx context.Context, logger jsonrpc.Function
128128
}
129129

130130
if cppContent, err := ls.buildSketchCpp.ReadFile(); err == nil {
131-
oldVesrion := ls.sketchMapper.CppText.Version
131+
oldVersion := ls.sketchMapper.CppText.Version
132132
ls.sketchMapper = sourcemapper.CreateInoMapper(cppContent)
133-
ls.sketchMapper.CppText.Version = oldVesrion + 1
133+
ls.sketchMapper.CppText.Version = oldVersion + 1
134134
ls.sketchMapper.DebugLogAll()
135135
} else {
136136
return errors.WithMessage(err, "reading generated cpp file from sketch")
@@ -143,7 +143,7 @@ func (r *SketchRebuilder) doRebuild(ctx context.Context, logger jsonrpc.Function
143143
TextDocument: lsp.TextDocumentIdentifier{URI: cppURI},
144144
}
145145
if err := ls.Clangd.conn.TextDocumentDidSave(didSaveParams); err != nil {
146-
logger.Logf("error reinitilizing clangd:", err)
146+
logger.Logf("error reinitializing clangd:", err)
147147
return err
148148
}
149149

@@ -159,7 +159,7 @@ func (r *SketchRebuilder) doRebuild(ctx context.Context, logger jsonrpc.Function
159159
},
160160
}
161161
if err := ls.Clangd.conn.TextDocumentDidChange(didChangeParams); err != nil {
162-
logger.Logf("error reinitilizing clangd:", err)
162+
logger.Logf("error reinitializing clangd:", err)
163163
return err
164164
}
165165

Diff for: ls/ls.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ func (ls *INOLanguageServer) InitializeReqFromIDE(ctx context.Context, logger js
197197
clangInitializeParams.RootPath = ls.buildSketchRoot.String()
198198
clangInitializeParams.RootURI = lsp.NewDocumentURIFromPath(ls.buildSketchRoot)
199199
if clangInitializeResult, clangErr, err := ls.Clangd.conn.Initialize(ctx, &clangInitializeParams); err != nil {
200-
logger.Logf("error initilizing clangd: %v", err)
200+
logger.Logf("error initializing clangd: %v", err)
201201
return
202202
} else if clangErr != nil {
203-
logger.Logf("error initilizing clangd: %v", clangErr.AsError())
203+
logger.Logf("error initializing clangd: %v", clangErr.AsError())
204204
return
205205
} else {
206206
logger.Logf("clangd successfully started: %s", string(lsp.EncodeMessage(clangInitializeResult)))
@@ -335,7 +335,7 @@ func (ls *INOLanguageServer) InitializeReqFromIDE(ctx context.Context, logger js
335335
// TokenModifiers: []string{},
336336
// },
337337
// Range: false,
338-
// Full: &lsp.SemantiTokenFullOptions{
338+
// Full: &lsp.SemanticTokenFullOptions{
339339
// Delta: true,
340340
// },
341341
// },
@@ -425,7 +425,7 @@ func (ls *INOLanguageServer) TextDocumentCompletionReqFromIDE(ctx context.Contex
425425
if clangItem.Command != nil {
426426
c := ls.clang2IdeCommand(logger, *clangItem.Command)
427427
if c == nil {
428-
continue // Skit item with unsupported command convertion
428+
continue // Skit item with unsupported command conversion
429429
}
430430
ideCommand = c
431431
}
@@ -583,7 +583,7 @@ func (ls *INOLanguageServer) TextDocumentDefinitionReqFromIDE(ctx context.Contex
583583

584584
func (ls *INOLanguageServer) TextDocumentTypeDefinitionReqFromIDE(ctx context.Context, logger jsonrpc.FunctionLogger, ideParams *lsp.TypeDefinitionParams) ([]lsp.Location, []lsp.LocationLink, *jsonrpc.ResponseError) {
585585
// XXX: This capability is not advertised in the initialization message (clangd
586-
// does not advetise it either, so maybe we should just not implement it)
586+
// does not advertise it either, so maybe we should just not implement it)
587587
ls.readLock(logger, true)
588588
defer ls.readUnlock(logger)
589589

@@ -1184,7 +1184,7 @@ func (ls *INOLanguageServer) PublishDiagnosticsNotifFromClangd(logger jsonrpc.Fu
11841184
ls.ideInoDocsWithDiagnostics[ideInoURI] = true
11851185
}
11861186

1187-
// .. and cleanup all previouse diagnostics that are no longer valid...
1187+
// .. and cleanup all previous diagnostics that are no longer valid...
11881188
for ideInoURI := range ls.ideInoDocsWithDiagnostics {
11891189
if _, ok := allIdeParams[ideInoURI]; ok {
11901190
continue
@@ -1206,7 +1206,7 @@ func (ls *INOLanguageServer) PublishDiagnosticsNotifFromClangd(logger jsonrpc.Fu
12061206
_ = json.Unmarshal(ideDiag.Code, &code)
12071207
switch code {
12081208
case "":
1209-
// Filter unkown non-string codes
1209+
// Filter unknown non-string codes
12101210
case "drv_unknown_argument_with_suggestion":
12111211
// Skip errors like: "Unknown argument '-mlongcalls'; did you mean '-mlong-calls'?"
12121212
case "drv_unknown_argument":
@@ -1284,7 +1284,7 @@ func (ls *INOLanguageServer) ideURIIsPartOfTheSketch(ideURI lsp.DocumentURI) boo
12841284
func (ls *INOLanguageServer) ProgressNotifFromClangd(logger jsonrpc.FunctionLogger, progress *lsp.ProgressParams) {
12851285
var token string
12861286
if err := json.Unmarshal(progress.Token, &token); err != nil {
1287-
logger.Logf("error decoding progess token: %s", err)
1287+
logger.Logf("error decoding progress token: %s", err)
12881288
return
12891289
}
12901290
switch value := progress.TryToDecodeWellKnownValues().(type) {
@@ -1455,7 +1455,7 @@ func (ls *INOLanguageServer) clang2IdeCommand(logger jsonrpc.FunctionLogger, cla
14551455

14561456
converted, err := json.Marshal(v)
14571457
if err != nil {
1458-
panic("Internal Error: json conversion of codeAcion command arguments")
1458+
panic("Internal Error: json conversion of codeAction command arguments")
14591459
}
14601460
ideCommand.Arguments[i] = converted
14611461
}
@@ -1481,7 +1481,7 @@ func (ls *INOLanguageServer) cpp2inoWorkspaceEdit(logger jsonrpc.FunctionLogger,
14811481
continue
14821482
}
14831483

1484-
// ...otherwise convert edits to the sketch.ino.cpp into multilpe .ino edits
1484+
// ...otherwise convert edits to the sketch.ino.cpp into multiple .ino edits
14851485
for _, edit := range edits {
14861486
inoURI, inoRange, inPreprocessed, err := ls.clang2IdeRangeAndDocumentURI(logger, editURI, edit.Range)
14871487
if err != nil {

0 commit comments

Comments
 (0)