Skip to content
This repository was archived by the owner on May 7, 2024. It is now read-only.

Commit c735bc8

Browse files
znckgrammarly-znck
andauthored
Get config from workspace configuration (#247)
Co-authored-by: Rahul Kadyan <[email protected]>
1 parent 3777cc4 commit c735bc8

File tree

4 files changed

+18
-6
lines changed

4 files changed

+18
-6
lines changed

.changeset/fluffy-lions-stare.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'grammarly-languageserver': patch
3+
---
4+
5+
Use config from workspace configuration in Grammarly SDK

packages/grammarly-languageserver/src/services/ConfigurationService.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,19 @@ export class ConfigurationService implements Registerable {
1919
}
2020

2121
public async getSettings(): Promise<DocumentConfig> {
22-
return await this.#connection.workspace.getConfiguration('grammarly')
22+
const result: { config?: DocumentConfig } | undefined = await this.#connection.workspace.getConfiguration(
23+
'grammarly',
24+
)
25+
26+
return result?.config ?? {}
2327
}
2428

2529
public async getDocumentSettings(uri: string): Promise<DocumentConfig> {
26-
return Promise.race([
30+
const result: { config?: DocumentConfig } | undefined = await Promise.race([
2731
this.#connection.workspace.getConfiguration({ scopeUri: uri, section: 'grammarly' }),
2832
new Promise((resolve) => setTimeout(resolve, 1000, {})),
2933
])
34+
35+
return result?.config ?? {}
3036
}
3137
}

packages/grammarly-languageserver/src/services/DiagnosticsService.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ export class DiagnosticsService implements Registerable {
4949
this.#connection.console.log(`${document.session.status} ${document.original.uri}`)
5050
const diagnostics = new Map<SuggestionId, SuggestionDiagnostic>()
5151
const sendDiagnostics = (): void => {
52-
this.#connection.console.log(`${diagnostics.size} suggestion(s) in ${document.original.uri}`)
5352
this.#connection.sendDiagnostics({
5453
uri: document.original.uri,
5554
diagnostics: Array.from(diagnostics.values()).map((item) => item.diagnostic),

packages/grammarly-languageserver/src/services/DocumentService.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ export class DocumentService implements Registerable {
3838
this.#config = config
3939
this.#documents = createTextDocuments({
4040
create(uri, languageId, version, content) {
41-
return new GrammarlyDocument(TextDocument.create(uri, languageId, version, content), async () =>
42-
sdk.withText({ ops: [] }, await config.getDocumentSettings(uri)),
43-
)
41+
return new GrammarlyDocument(TextDocument.create(uri, languageId, version, content), async () => {
42+
const options = await config.getDocumentSettings(uri)
43+
connection.console.log(`create text checking session for "${uri}" with ${JSON.stringify(options, null, 2)} `)
44+
return sdk.withText({ ops: [] }, options)
45+
})
4446
},
4547
update(document, changes, version) {
4648
document.update(changes, version)

0 commit comments

Comments
 (0)