Skip to content

Commit aa26d6e

Browse files
aminyaaminya
committed
chore: format
1 parent 6601427 commit aa26d6e

File tree

5 files changed

+55
-68
lines changed

5 files changed

+55
-68
lines changed

‎lib/adapters/autocomplete-adapter.ts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import { Suggestion, TextSuggestion, SnippetSuggestion } from "../types/autocomp
2828
* - if `false` -> the edits are inserted : const|ole
2929
* - if `true`` -> the edits are replaced: const|
3030
*/
31-
type ShouldReplace = boolean;
31+
type ShouldReplace = boolean
3232

3333
/**
3434
* Holds a list of suggestions generated from the CompletionItem[]
@@ -93,7 +93,7 @@ export default class AutocompleteAdapter {
9393
request: ac.SuggestionsRequestedEvent,
9494
onDidConvertCompletionItem?: CompletionItemAdjuster,
9595
minimumWordLength?: number,
96-
shouldReplace: ShouldReplace = false,
96+
shouldReplace: ShouldReplace = false
9797
): Promise<ac.AnySuggestion[]> {
9898
const triggerChars =
9999
server.capabilities.completionProvider != null
@@ -472,21 +472,23 @@ export default class AutocompleteAdapter {
472472
triggerColumns: [number, number],
473473
originalBufferPosition: Point,
474474
suggestion: TextSuggestion,
475-
shouldReplace: ShouldReplace,
475+
shouldReplace: ShouldReplace
476476
): void {
477-
if (!textEdit) { return; }
478-
let range: Range;
479-
if ('range' in textEdit) {
480-
range = textEdit.range;
477+
if (!textEdit) {
478+
return
479+
}
480+
let range: Range
481+
if ("range" in textEdit) {
482+
range = textEdit.range
481483
} else if (shouldReplace) {
482-
range = textEdit.replace;
484+
range = textEdit.replace
483485
} else {
484-
range = textEdit.insert;
486+
range = textEdit.insert
485487
}
486488

487489
if (range.start.character !== triggerColumns[0]) {
488-
const atomRange = Convert.lsRangeToAtomRange(range);
489-
suggestion.customReplacmentPrefix = editor.getTextInBufferRange([atomRange.start, originalBufferPosition]);
490+
const atomRange = Convert.lsRangeToAtomRange(range)
491+
suggestion.customReplacmentPrefix = editor.getTextInBufferRange([atomRange.start, originalBufferPosition])
490492
}
491493
suggestion.text = textEdit.newText
492494
}

‎lib/adapters/document-sync-adapter.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -410,10 +410,10 @@ export class TextEditorSyncAdapter {
410410

411411
const uri = this.getEditorUri()
412412
const didSaveNotification = {
413-
textDocument: { uri, version: this._getVersion((uri)) },
414-
} as DidSaveTextDocumentParams;
415-
if (typeof this._documentSync.save === 'object' && this._documentSync.save.includeText) {
416-
didSaveNotification.text = this._editor.getText();
413+
textDocument: { uri, version: this._getVersion(uri) },
414+
} as DidSaveTextDocumentParams
415+
if (typeof this._documentSync.save === "object" && this._documentSync.save.includeText) {
416+
didSaveNotification.text = this._editor.getText()
417417
}
418418
this._connection.didSaveTextDocument(didSaveNotification)
419419
if (this._fakeDidChangeWatchedFiles) {

‎lib/auto-languageclient.ts

Lines changed: 33 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,36 @@
1-
import * as cp from 'child_process';
2-
import * as ls from './languageclient';
3-
import * as rpc from 'vscode-jsonrpc';
4-
import * as rpcNode from 'vscode-jsonrpc/node';
5-
import * as path from 'path';
6-
import * as atomIde from 'atom-ide';
7-
import * as linter from 'atom/linter';
8-
import Convert from './convert.js';
9-
import ApplyEditAdapter from './adapters/apply-edit-adapter';
10-
import AutocompleteAdapter from './adapters/autocomplete-adapter';
11-
import CodeActionAdapter from './adapters/code-action-adapter';
12-
import CodeFormatAdapter from './adapters/code-format-adapter';
13-
import CodeHighlightAdapter from './adapters/code-highlight-adapter';
14-
import DatatipAdapter from './adapters/datatip-adapter';
15-
import DefinitionAdapter from './adapters/definition-adapter';
16-
import DocumentSyncAdapter from './adapters/document-sync-adapter';
17-
import FindReferencesAdapter from './adapters/find-references-adapter';
18-
import LinterPushV2Adapter from './adapters/linter-push-v2-adapter';
19-
import LoggingConsoleAdapter from './adapters/logging-console-adapter';
20-
import NotificationsAdapter from './adapters/notifications-adapter';
21-
import OutlineViewAdapter from './adapters/outline-view-adapter';
22-
import RenameAdapter from './adapters/rename-adapter';
23-
import SignatureHelpAdapter from './adapters/signature-help-adapter';
24-
import * as Utils from './utils';
25-
import { Socket } from 'net';
26-
import { LanguageClientConnection } from './languageclient';
27-
import {
28-
ConsoleLogger,
29-
FilteredLogger,
30-
Logger,
31-
} from './logger';
32-
import {
33-
LanguageServerProcess,
34-
ServerManager,
35-
ActiveServer,
36-
} from './server-manager.js';
37-
import {
38-
Disposable,
39-
CompositeDisposable,
40-
Point,
41-
Range,
42-
TextEditor,
43-
} from 'atom';
44-
import * as ac from 'atom/autocomplete-plus';
45-
46-
export { ActiveServer, LanguageClientConnection, LanguageServerProcess };
47-
export type ConnectionType = 'stdio' | 'socket' | 'ipc';
1+
import * as cp from "child_process"
2+
import * as ls from "./languageclient"
3+
import * as rpc from "vscode-jsonrpc"
4+
import * as rpcNode from "vscode-jsonrpc/node"
5+
import * as path from "path"
6+
import * as atomIde from "atom-ide"
7+
import * as linter from "atom/linter"
8+
import Convert from "./convert.js"
9+
import ApplyEditAdapter from "./adapters/apply-edit-adapter"
10+
import AutocompleteAdapter from "./adapters/autocomplete-adapter"
11+
import CodeActionAdapter from "./adapters/code-action-adapter"
12+
import CodeFormatAdapter from "./adapters/code-format-adapter"
13+
import CodeHighlightAdapter from "./adapters/code-highlight-adapter"
14+
import DatatipAdapter from "./adapters/datatip-adapter"
15+
import DefinitionAdapter from "./adapters/definition-adapter"
16+
import DocumentSyncAdapter from "./adapters/document-sync-adapter"
17+
import FindReferencesAdapter from "./adapters/find-references-adapter"
18+
import LinterPushV2Adapter from "./adapters/linter-push-v2-adapter"
19+
import LoggingConsoleAdapter from "./adapters/logging-console-adapter"
20+
import NotificationsAdapter from "./adapters/notifications-adapter"
21+
import OutlineViewAdapter from "./adapters/outline-view-adapter"
22+
import RenameAdapter from "./adapters/rename-adapter"
23+
import SignatureHelpAdapter from "./adapters/signature-help-adapter"
24+
import * as Utils from "./utils"
25+
import { Socket } from "net"
26+
import { LanguageClientConnection } from "./languageclient"
27+
import { ConsoleLogger, FilteredLogger, Logger } from "./logger"
28+
import { LanguageServerProcess, ServerManager, ActiveServer } from "./server-manager.js"
29+
import { Disposable, CompositeDisposable, Point, Range, TextEditor } from "atom"
30+
import * as ac from "atom/autocomplete-plus"
31+
32+
export { ActiveServer, LanguageClientConnection, LanguageServerProcess }
33+
export type ConnectionType = "stdio" | "socket" | "ipc"
4834

4935
export interface ServerAdapters {
5036
linterPushV2: LinterPushV2Adapter

‎lib/languageclient.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -533,12 +533,11 @@ export class LanguageClientConnection extends EventEmitter {
533533
this._log.debug(`rpc.sendRequest ${method} received (${Math.floor(took)}ms)`, result)
534534
return result
535535
} catch (e) {
536-
const responseError = e as jsonrpc.ResponseError<any>;
536+
const responseError = e as jsonrpc.ResponseError<any>
537537
if (cancellationToken && responseError.code === lsp.LSPErrorCodes.RequestCancelled) {
538-
this._log.debug(`rpc.sendRequest ${method} was cancelled`);
539-
}
540-
else {
541-
this._log.error(`rpc.sendRequest ${method} threw`, e);
538+
this._log.debug(`rpc.sendRequest ${method} was cancelled`)
539+
} else {
540+
this._log.error(`rpc.sendRequest ${method} threw`, e)
542541
}
543542

544543
throw e

‎test/helpers.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ export function createSpyConnection(): rpc.MessageConnection {
2020
trace: sinon.spy(),
2121
inspect: sinon.spy(),
2222
end: sinon.spy(),
23-
};
23+
}
2424
}
2525

2626
export function createFakeEditor(path?: string): TextEditor {

0 commit comments

Comments
 (0)