Skip to content

Commit 80c66f6

Browse files
committed
chore: cleanup, simplify implicit fragment completion API
1 parent f38791b commit 80c66f6

File tree

3 files changed

+4
-56
lines changed

3 files changed

+4
-56
lines changed

packages/graphql-language-service-interface/src/GraphQLLanguageService.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ export class GraphQLLanguageService {
240240
query,
241241
position,
242242
undefined,
243-
fragmentInfo,
243+
fragmentInfo.map(({ definition }) => definition),
244244
);
245245
}
246246
return [];

packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import {
2727
CompletionItem,
2828
AllTypeInfo,
2929
Position,
30-
FragmentInfo,
3130
} from 'graphql-language-service-types';
3231

3332
import {
@@ -71,7 +70,7 @@ export function getAutocompleteSuggestions(
7170
queryText: string,
7271
cursor: Position,
7372
contextToken?: ContextToken,
74-
fragmentDefs?: FragmentInfo[],
73+
fragmentDefs?: FragmentDefinitionNode[],
7574
): Array<CompletionItem> {
7675
const token = contextToken || getTokenAtPosition(queryText, cursor);
7776

@@ -369,14 +368,14 @@ function getSuggestionsForFragmentSpread(
369368
typeInfo: AllTypeInfo,
370369
schema: GraphQLSchema,
371370
queryText: string,
372-
fragmentDefs?: FragmentInfo[],
371+
fragmentDefs?: FragmentDefinitionNode[],
373372
): Array<CompletionItem> {
374373
const typeMap = schema.getTypeMap();
375374
const defState = getDefinitionState(token.state);
376375
const fragments = getFragmentDefinitions(queryText);
377376

378377
if (fragmentDefs) {
379-
fragments.push(...fragmentDefs.map(info => info.definition));
378+
fragments.push(...fragmentDefs);
380379
}
381380

382381
// Filter down to only the fragments which may exist here.

yarn.lock

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -7048,14 +7048,6 @@ codecov@^3.6.5:
70487048
teeny-request "6.0.1"
70497049
urlgrey "0.4.4"
70507050

7051-
codemirror-graphql@^0.12.0:
7052-
version "0.12.1"
7053-
resolved "https://registry.yarnpkg.com/codemirror-graphql/-/codemirror-graphql-0.12.1.tgz#02ce19ffe15397c049ca87c195ac13080d2abe8f"
7054-
integrity sha512-PlOCTpfBBUwDZXQo60ZfzD/nGZsaJoE1tA07Uf9xJN7R0kBDGJeD4AVfdUTprZr27p0JIntJzmL6mt/G4Zkzeg==
7055-
dependencies:
7056-
graphql-language-service-interface "^2.4.1"
7057-
graphql-language-service-parser "^1.6.1"
7058-
70597051
codemirror@^5.52.2, codemirror@^5.54.0:
70607052
version "5.57.0"
70617053
resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.57.0.tgz#d26365b72f909f5d2dbb6b1209349ca1daeb2d50"
@@ -10401,49 +10393,6 @@ graphql-config@^3.0.2, graphql-config@^3.0.3:
1040110393
string-env-interpolation "1.0.1"
1040210394
tslib "^2.0.0"
1040310395

10404-
graphql-language-service-interface@^2.4.0-alpha.7, graphql-language-service-interface@^2.4.1:
10405-
version "2.4.1"
10406-
resolved "https://registry.yarnpkg.com/graphql-language-service-interface/-/graphql-language-service-interface-2.4.1.tgz#62aca7880469d0f9079aec22a9b297cf78994f52"
10407-
integrity sha512-cKT0ia7xNVpkLlI0vuwxVpPVIXwy02ah4I+N6s4mxFKVgo+lPlX9r933EWX6t1P1vzGJmNf+dip2dK3gHg2bBw==
10408-
dependencies:
10409-
graphql-language-service-parser "^1.6.1"
10410-
graphql-language-service-types "^1.6.1"
10411-
graphql-language-service-utils "^2.4.1"
10412-
vscode-languageserver-types "^3.15.1"
10413-
10414-
graphql-language-service-server@^2.4.0-alpha.7:
10415-
version "2.4.1"
10416-
resolved "https://registry.yarnpkg.com/graphql-language-service-server/-/graphql-language-service-server-2.4.1.tgz#1baea9095e92109dd51beb2126b5053664039ee2"
10417-
integrity sha512-fA4ZBB0hfERwCDA9p49Z325Zm5kafyW8PyAeDhoJ3tdSiwY8MRzK52d0HLUx6+AZmEVyYOkVjKhXeD4V6IV6Sg==
10418-
dependencies:
10419-
"@babel/parser" "^7.9.0"
10420-
glob "^7.1.2"
10421-
graphql-config "^3.0.2"
10422-
graphql-language-service "^3.0.1"
10423-
graphql-language-service-utils "^2.4.1"
10424-
nullthrows "^1.0.0"
10425-
vscode-jsonrpc "^5.0.1"
10426-
vscode-languageserver "^6.1.1"
10427-
10428-
graphql-language-service@^2.4.0-alpha.7:
10429-
version "2.4.0-alpha.7"
10430-
resolved "https://registry.yarnpkg.com/graphql-language-service/-/graphql-language-service-2.4.0-alpha.7.tgz#cd7eef87f7a89426c30d34534e6206e2d78d42ad"
10431-
integrity sha512-Uc3OmtbT2jegmhcrEdo4AF2M6JmchSFX+i+sNhJEADg0CtzoXQQd05TPvMm3l1xYALzQCD/9iAXvYSGrQrfggA==
10432-
dependencies:
10433-
"@babel/polyfill" "7.8.7"
10434-
graphql-language-service-interface "^2.4.0-alpha.7"
10435-
graphql-language-service-server "^2.4.0-alpha.7"
10436-
graphql-language-service-utils "^2.4.0-alpha.6"
10437-
yargs "^15.3.1"
10438-
10439-
graphql-language-service@^3.0.1:
10440-
version "3.0.1"
10441-
resolved "https://registry.yarnpkg.com/graphql-language-service/-/graphql-language-service-3.0.1.tgz#1253a5cb3affe7c272bbcfadd89c1f0eb78ece2f"
10442-
integrity sha512-79EGvEECgn1HIX0VBh3pXqetqgdtRHfkNTws0mcirCtFowwqt+QZAKKBNKVLY2vMya9wNVLDWUvzl0FF5wbBTA==
10443-
dependencies:
10444-
graphql-language-service-interface "^2.4.1"
10445-
graphql-language-service-types "^1.6.1"
10446-
1044710396
[email protected], graphql@^15.0.0:
1044810397
version "15.0.0"
1044910398
resolved "https://registry.yarnpkg.com/graphql/-/graphql-15.0.0.tgz#042a5eb5e2506a2e2111ce41eb446a8e570b8be9"

0 commit comments

Comments
 (0)