commit 8614a80202d7eac474be77e8f86c9af0450acf3a · kitten.sh/graphqlsp

.changeset/hip-poems-remain.md

···

       1
       +
       ---

     

       2
       +
       '@0no-co/graphqlsp': minor

     

       3
       +
       ---

     

       4
       +
       

     

       5
       +
       Use our internal suggestions algo for better arugments and spread-suggestions

+43 -21

packages/graphqlsp/src/autoComplete.ts

···

       11
        
         CharacterStream,

     

       12
        
         ContextToken,

     

       13
        
       } from 'graphql-language-service';

     

       14
       -
       import { FragmentDefinitionNode, GraphQLSchema, Kind, parse } from 'graphql';

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       

     

       16
        
       import {

     

       17
        
         bubbleUpCallExpression,

     
···

       31
        
         schema: { current: GraphQLSchema | null },

     

       32
        
         info: ts.server.PluginCreateInfo

     

       33
        
       ): ts.WithMetadata<ts.CompletionInfo> | undefined {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       34
        
         const tagTemplate = info.config.template || 'gql';

     

       35
        
         const isCallExpression = info.config.templateIsCallExpression ?? false;

     

       36
        
       

     
···

       56
        
       

     

       57
        
           const queryText = node.arguments[0].getText();

     

       58
        
           const fragments = getAllFragments(filename, node, info);

     

       59
       -
           const cursor = new Cursor(foundToken.line, foundToken.start);

     

       60
       -
           const items = getAutocompleteSuggestions(

     

       0
        
       
     

       0
        
       
     

       61
        
             schema.current,

     

       62
       -
             queryText,

     

       63
       -
             cursor,

     

       64
       -
             undefined,

     

       65
       -
             fragments

     

       66
        
           );

     

       67
        
       

     

       68
        
           return {

     

       69
        
             isGlobalCompletion: false,

     

       70
        
             isMemberCompletion: false,

     

       71
        
             isNewIdentifierLocation: false,

     

       72
       -
             entries: items.map(suggestion => ({

     

       73
       -
               ...suggestion,

     

       74
       -
               kind: ts.ScriptElementKind.variableElement,

     

       75
       -
               name: suggestion.label,

     

       76
       -
               kindModifiers: 'declare',

     

       77
       -
               sortText: suggestion.sortText || '0',

     

       78
       -
               labelDetails: {

     

       79
       -
                 detail: suggestion.type

     

       80
       -
                   ? ' ' + suggestion.type?.toString()

     

       81
       -
                   : undefined,

     

       82
       -
                 description: suggestion.documentation,

     

       83
       -
               },

     

       84
       -
             })),

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       85
        
           };

     

       86
        
         } else if (ts.isTaggedTemplateExpression(node)) {

     

       87
        
           const { template, tag } = node;

     
···

       107
        
       

     

       108
        
           foundToken.line = foundToken.line + amountOfLines;

     

       109
        
       

     

       110
       -
           const cursor = new Cursor(foundToken.line, foundToken.start);

     

       111
        
       

     

       112
        
           const [suggestions, spreadSuggestions] = getSuggestionsInternal(

     

       113
        
             schema.current,

···

       11
        
         CharacterStream,

     

       12
        
         ContextToken,

     

       13
        
       } from 'graphql-language-service';

     

       14
       +
       import {

     

       15
       +
         FragmentDefinitionNode,

     

       16
       +
         GraphQLSchema,

     

       17
       +
         Kind,

     

       18
       +
         parse,

     

       19
       +
         print,

     

       20
       +
       } from 'graphql';

     

       21
        
       

     

       22
        
       import {

     

       23
        
         bubbleUpCallExpression,

     
···

       37
        
         schema: { current: GraphQLSchema | null },

     

       38
        
         info: ts.server.PluginCreateInfo

     

       39
        
       ): ts.WithMetadata<ts.CompletionInfo> | undefined {

     

       40
       +
         const logger: any = (msg: string) =>

     

       41
       +
           info.project.projectService.logger.info(`[GraphQLSP] ${msg}`);

     

       42
       +
       

     

       43
        
         const tagTemplate = info.config.template || 'gql';

     

       44
        
         const isCallExpression = info.config.templateIsCallExpression ?? false;

     

       45
        
       

     
···

       65
        
       

     

       66
        
           const queryText = node.arguments[0].getText();

     

       67
        
           const fragments = getAllFragments(filename, node, info);

     

       68
       +
           const cursor = new Cursor(foundToken.line, foundToken.start - 1);

     

       69
       +
           const text = `${queryText}\m${fragments.map(x => print(x)).join('\n')}`;

     

       70
       +
       

     

       71
       +
           const [suggestions, spreadSuggestions] = getSuggestionsInternal(

     

       72
        
             schema.current,

     

       73
       +
             text,

     

       74
       +
             cursor

     

       0
        
       
     

       0
        
       
     

       75
        
           );

     

       76
        
       

     

       77
        
           return {

     

       78
        
             isGlobalCompletion: false,

     

       79
        
             isMemberCompletion: false,

     

       80
        
             isNewIdentifierLocation: false,

     

       81
       +
             entries: [

     

       82
       +
               ...suggestions.map(suggestion => ({

     

       83
       +
                 ...suggestion,

     

       84
       +
                 kind: ts.ScriptElementKind.variableElement,

     

       85
       +
                 name: suggestion.label,

     

       86
       +
                 kindModifiers: 'declare',

     

       87
       +
                 sortText: suggestion.sortText || '0',

     

       88
       +
                 labelDetails: {

     

       89
       +
                   detail: suggestion.type

     

       90
       +
                     ? ' ' + suggestion.type?.toString()

     

       91
       +
                     : undefined,

     

       92
       +
                   description: suggestion.documentation,

     

       93
       +
                 },

     

       94
       +
               })),

     

       95
       +
               ...spreadSuggestions.map(suggestion => ({

     

       96
       +
                 ...suggestion,

     

       97
       +
                 kind: ts.ScriptElementKind.variableElement,

     

       98
       +
                 name: suggestion.label,

     

       99
       +
                 insertText: '...' + suggestion.label,

     

       100
       +
                 kindModifiers: 'declare',

     

       101
       +
                 sortText: '0',

     

       102
       +
                 labelDetails: {

     

       103
       +
                   description: suggestion.documentation,

     

       104
       +
                 },

     

       105
       +
               })),

     

       106
       +
             ],

     

       107
        
           };

     

       108
        
         } else if (ts.isTaggedTemplateExpression(node)) {

     

       109
        
           const { template, tag } = node;

     
···

       129
        
       

     

       130
        
           foundToken.line = foundToken.line + amountOfLines;

     

       131
        
       

     

       132
       +
           const cursor = new Cursor(foundToken.line, foundToken.start - 1);

     

       133
        
       

     

       134
        
           const [suggestions, spreadSuggestions] = getSuggestionsInternal(

     

       135
        
             schema.current,

+2 -2

packages/graphqlsp/src/quickInfo.ts

···

       42
        
           if (!schema.current || !foundToken) return undefined;

     

       43
        
       

     

       44
        
           const queryText = node.arguments[0].getText();

     

       45
       -
           const cursor = new Cursor(foundToken.line, foundToken.start);

     

       46
        
           const hoverInfo = getHoverInformation(schema.current, queryText, cursor);

     

       47
        
       

     

       48
        
           return {

     
···

       83
        
           const hoverInfo = getHoverInformation(

     

       84
        
             schema.current,

     

       85
        
             text,

     

       86
       -
             new Cursor(foundToken.line, foundToken.start)

     

       87
        
           );

     

       88
        
       

     

       89
        
           return {

···

       42
        
           if (!schema.current || !foundToken) return undefined;

     

       43
        
       

     

       44
        
           const queryText = node.arguments[0].getText();

     

       45
       +
           const cursor = new Cursor(foundToken.line, foundToken.start - 1);

     

       46
        
           const hoverInfo = getHoverInformation(schema.current, queryText, cursor);

     

       47
        
       

     

       48
        
           return {

     
···

       83
        
           const hoverInfo = getHoverInformation(

     

       84
        
             schema.current,

     

       85
        
             text,

     

       86
       +
             new Cursor(foundToken.line, foundToken.start - 1)

     

       87
        
           );

     

       88
        
       

     

       89
        
           return {