Skip to content

Commit 6f4e6d2

Browse files
dimaMachinadimaMachina
committed
fixes
1 parent 18450ec commit 6f4e6d2

10 files changed

Lines changed: 15 additions & 62 deletions

File tree

‎packages/codemirror-graphql/src/results/mode.ts‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,8 @@
99

1010
import CodeMirror from 'codemirror';
1111

12-
import {
13-
list,
14-
t,
15-
onlineParser,
16-
p,
17-
State,
18-
Token,
19-
} from 'graphql-language-service';
12+
import { list, t, onlineParser, p, Token } from 'graphql-language-service';
13+
import indent from '../utils/mode-indent';
2014

2115
/**
2216
* This mode defines JSON, but provides a data-laden parser state to enable
@@ -44,24 +38,6 @@ CodeMirror.defineMode('graphql-results', config => {
4438
};
4539
});
4640

47-
function indent(
48-
this: CodeMirror.Mode<any> & {
49-
electricInput?: RegExp;
50-
config?: CodeMirror.EditorConfiguration;
51-
},
52-
state: State,
53-
textAfter: string,
54-
) {
55-
const { levels, indentLevel } = state;
56-
// If there is no stack of levels, use the current level.
57-
// Otherwise, use the top level, preemptively dedenting for close braces.
58-
const level =
59-
!levels || levels.length === 0
60-
? indentLevel
61-
: levels.at(-1) - (this.electricInput?.test(textAfter) ? 1 : 0);
62-
return (level || 0) * (this.config?.indentUnit || 0);
63-
}
64-
6541
/**
6642
* The lexer rules. These are exactly as described by the spec.
6743
*/

‎packages/codemirror-graphql/src/utils/mode-indent.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ export default function indent(
2525
const level =
2626
!levels || levels.length === 0
2727
? indentLevel
28-
: levels.at(-1) - (this.electricInput?.test(textAfter) ? 1 : 0);
28+
: levels.at(-1)! - (this.electricInput?.test(textAfter) ? 1 : 0);
2929
return (level || 0) * (this.config?.indentUnit || 0);
3030
}

‎packages/codemirror-graphql/src/variables/mode.ts‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
State,
1919
Token,
2020
} from 'graphql-language-service';
21+
import indent from '../utils/mode-indent';
2122

2223
/**
2324
* This mode defines JSON, but provides a data-laden parser state to enable
@@ -45,24 +46,6 @@ CodeMirror.defineMode('graphql-variables', config => {
4546
};
4647
});
4748

48-
function indent(
49-
this: CodeMirror.Mode<any> & {
50-
electricInput?: RegExp;
51-
config?: CodeMirror.EditorConfiguration;
52-
},
53-
state: State,
54-
textAfter: string,
55-
) {
56-
const { levels, indentLevel } = state;
57-
// If there is no stack of levels, use the current level.
58-
// Otherwise, use the top level, preemptively dedenting for close braces.
59-
const level =
60-
!levels || levels.length === 0
61-
? indentLevel
62-
: levels.at(-1) - (this.electricInput?.test(textAfter) ? 1 : 0);
63-
return (level || 0) * (this.config?.indentUnit || 0);
64-
}
65-
6649
/**
6750
* The lexer rules. These are exactly as described by the spec.
6851
*/

‎packages/graphiql-react/src/explorer/components/doc-explorer.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export function DocExplorer() {
2121
caller: DocExplorer,
2222
});
2323

24-
const navItem = explorerNavStack.at(-1);
24+
const navItem = explorerNavStack.at(-1)!;
2525

2626
let content: ReactNode = null;
2727
if (fetchError) {
@@ -55,7 +55,7 @@ export function DocExplorer() {
5555

5656
let prevName;
5757
if (explorerNavStack.length > 1) {
58-
prevName = explorerNavStack.at(-2).name;
58+
prevName = explorerNavStack.at(-2)!.name;
5959
}
6060

6161
return (

‎packages/graphiql-react/src/explorer/components/search.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export function Search() {
5858
return () => window.removeEventListener('keydown', handleKeyDown);
5959
}, []);
6060

61-
const navItem = explorerNavStack.at(-1);
61+
const navItem = explorerNavStack.at(-1)!;
6262

6363
const shouldSearchBoxAppear =
6464
explorerNavStack.length === 1 ||
@@ -198,7 +198,7 @@ export function useSearchResults(caller?: Function) {
198198
caller: caller || useSearchResults,
199199
});
200200

201-
const navItem = explorerNavStack.at(-1);
201+
const navItem = explorerNavStack.at(-1)!;
202202

203203
return useCallback(
204204
(searchValue: string) => {

‎packages/graphiql-react/src/explorer/context.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ export function ExplorerContextProvider(props: ExplorerContextProviderProps) {
8383

8484
const push = useCallback((item: ExplorerNavStackItem) => {
8585
setNavStack(currentState => {
86-
const lastItem = currentState.at(-1);
86+
const lastItem = currentState.at(-1)!;
8787
return lastItem.def === item.def
8888
? // Avoid pushing duplicate items
8989
currentState

‎packages/graphql-language-service-cli/src/client.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export default function main(
5656
case 'autocomplete':
5757
const lines = text.split('\n');
5858
const row = parseInt(argv.row, 10) || lines.length - 1;
59-
const column = parseInt(argv.column, 10) || lines.at(-1).length;
59+
const column = parseInt(argv.column, 10) || lines.at(-1)!.length;
6060
const point = new Position(row, column);
6161
exitCode = _getAutocompleteSuggestions(text, point, schemaPath);
6262
break;

‎packages/graphql-language-service-server/src/MessageProcessor.ts‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -419,22 +419,16 @@ export class MessageProcessor {
419419
// with version information up-to-date, so that the textDocument contents
420420
// may be used during performing language service features,
421421
// e.g. auto-completions.
422-
if (
423-
!params ||
424-
!params.textDocument ||
425-
!params.contentChanges ||
426-
!params.textDocument.uri
427-
) {
422+
if (!params?.textDocument?.uri || !params.contentChanges) {
428423
throw new Error(
429424
'`textDocument`, `textDocument.uri`, and `contentChanges` arguments are required.',
430425
);
431426
}
432-
const { textDocument } = params;
427+
const { textDocument, contentChanges } = params;
433428
const { uri } = textDocument;
434429
const project = this._graphQLCache.getProjectForFile(uri);
435430
try {
436-
const { contentChanges } = params;
437-
const contentChange = contentChanges.at(-1);
431+
const contentChange = contentChanges.at(-1)!;
438432

439433
// As `contentChanges` is an array, and we just want the
440434
// latest update to the text, grab the last entry from the array.

‎packages/graphql-language-service-server/src/parseDocument.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function parseDocument(
6868
const lines = query.split('\n');
6969
const range = new Range(
7070
new Position(0, 0),
71-
new Position(lines.length - 1, lines.at(-1).length - 1),
71+
new Position(lines.length - 1, lines.at(-1)!.length - 1),
7272
);
7373
return [{ query, range }];
7474
}

‎packages/graphql-language-service/src/parser/onlineParser.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ function getToken(
148148
if (
149149
state.indentLevel &&
150150
levels.length > 0 &&
151-
levels.at(-1) < state.indentLevel
151+
levels.at(-1)! < state.indentLevel
152152
) {
153153
state.indentLevel = levels.at(-1);
154154
}

0 commit comments

Comments
 (0)