Skip to content

Commit 36e35f6

Browse files
authored
Merge pull request #171 from atom-community/bump
2 parents e7d6e08 + 8275665 commit 36e35f6

File tree

9 files changed

+1143
-251
lines changed

9 files changed

+1143
-251
lines changed

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"extends": ["eslint-config-atomic/strict"],
2+
"extends": ["eslint-config-atomic"],
33
"ignorePatterns": ["build/", "node_modules/"],
44
"rules": {
55
"no-eq-null": "warn",

.github/workflows/CI.yml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ jobs:
2828
apm install
2929
3030
- name: Run tests
31-
uses: nick-invision/retry@v2
32-
with:
33-
timeout_minutes: 4
34-
max_attempts: 5
35-
command: npm run test
31+
run: npm run test
3632

3733
Lint:
3834
if: "!contains(github.event.head_commit.message, '[skip ci]')"

lib/adapters/autocomplete-adapter.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ export default class AutocompleteAdapter {
195195
const triggerColumns: [number, number] = [triggerPoint.column, request.bufferPosition.column]
196196

197197
// Setup the cache for subsequent filtered results
198-
const isComplete = completions === null || Array.isArray(completions) || completions.isIncomplete === false
198+
const isComplete = completions === null || Array.isArray(completions) || !completions.isIncomplete
199199
const suggestionMap = this.completionItemsToSuggestions(
200200
completions,
201201
request,
@@ -234,7 +234,7 @@ export default class AutocompleteAdapter {
234234
const cache = this._suggestionCache.get(server)
235235
if (cache) {
236236
const possiblyResolvedCompletionItem = cache.suggestionMap.get(suggestion)
237-
if (possiblyResolvedCompletionItem != null && possiblyResolvedCompletionItem.isResolved === false) {
237+
if (possiblyResolvedCompletionItem != null && !possiblyResolvedCompletionItem.isResolved) {
238238
const resolvedCompletionItem = await server.connection.completionItemResolve(
239239
possiblyResolvedCompletionItem.completionItem
240240
)

lib/adapters/code-action-adapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export default class CodeActionAdapter {
6565
): atomIde.CodeAction {
6666
return {
6767
async apply() {
68-
if ((await onApply(action)) === false) {
68+
if (!(await onApply(action))) {
6969
return
7070
}
7171
if (CodeAction.is(action)) {

package.json

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,24 @@
2727
"prettier": "prettier-config-atomic",
2828
"atomTestRunner": "./test/runner",
2929
"dependencies": {
30-
"@types/rimraf": "^3.0.0",
31-
"atom-ide-base": "^3.0.0",
30+
"@types/rimraf": "^3.0.1",
31+
"atom-ide-base": "^3.3.0",
3232
"rimraf": "^3.0.2",
3333
"vscode-jsonrpc": "6.0.0",
3434
"vscode-languageserver-protocol": "3.16.0",
3535
"vscode-languageserver-types": "3.16.0",
36-
"zadeh": "3.0.0-beta.3"
36+
"zadeh": "3.0.0-beta.4"
3737
},
3838
"devDependencies": {
39-
"@types/atom": "^1.40.10",
40-
"@types/jasmine": "^3.7.7",
41-
"@types/node": "15.12.2",
42-
"atom-jasmine3-test-runner": "^5.2.6",
43-
"eslint-config-atomic": "1.14.5",
39+
"@types/atom": "^1.40.11",
40+
"@types/jasmine": "^3.8.1",
41+
"@types/node": "16.3.2",
42+
"atom-jasmine3-test-runner": "^5.2.7",
43+
"eslint-config-atomic": "1.16.1",
4444
"prettier-config-atomic": "^2.0.5",
4545
"shx": "^0.3.3",
46-
"spawk": "^1.4.0",
47-
"typescript": "~4.3.2"
46+
"spawk": "^1.7.1",
47+
"standard-language-server": "^0.1.0",
48+
"typescript": "~4.3.5"
4849
}
4950
}

0 commit comments

Comments
 (0)