commit a7ddbdf40d68f539a2394d18a2ec920f88c87eeb · kitten.sh/graphqlsp

.changeset/new-pens-think.md

···

       1
       +
       ---

     

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

     

       3
       +
       ---

     

       4
       +
       

     

       5
       +
       Account for offsets in auto-complete as well

packages/example/src/index.ts

+11

packages/graphqlsp/src/autoComplete.ts

···

       53
        
             filename,

     

       54
        
             info

     

       55
        
           );

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

       57
        
       

     

       58
        
           const [suggestions, spreadSuggestions] = getSuggestionsInternal(

···

       53
        
             filename,

     

       54
        
             info

     

       55
        
           );

     

       56
       +
       

     

       57
       +
           const amountOfLines = resolvedSpans

     

       58
       +
             .filter(

     

       59
       +
               x =>

     

       60
       +
                 x.original.start < cursorPosition &&

     

       61
       +
                 x.original.start + x.original.length < cursorPosition

     

       62
       +
             )

     

       63
       +
             .reduce((acc, span) => acc + (span.lines - 1), 0);

     

       64
       +
       

     

       65
       +
           foundToken.line = foundToken.line + amountOfLines;

     

       66
       +
       

     

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

     

       68
        
       

     

       69
        
           const [suggestions, spreadSuggestions] = getSuggestionsInternal(

+74 -4

test/e2e/combinations.test.ts

···

       4
        
       import fs from 'node:fs';

     

       5
        
       import url from 'node:url';

     

       6
        
       import ts from 'typescript/lib/tsserverlibrary';

     

       7
       -
       import { waitForExpect } from './util';

     

       8
        
       

     

       9
        
       const __dirname = path.dirname(url.fileURLToPath(import.meta.url));

     

       10
        
       

     

       11
        
       const projectPath = path.resolve(__dirname, 'fixture-project');

     

       12
       -
       describe('Fragments', () => {

     

       13
        
         const outfileCombinations = path.join(projectPath, 'Combination.ts');

     

       14
        
       

     

       15
        
         let server: TSServer;

     
···

       85
        
                 "category": "error",

     

       86
        
                 "code": 52001,

     

       87
        
                 "end": {

     

       88
       -
                   "line": 16,

     

       89
        
                   "offset": 1,

     

       90
        
                 },

     

       91
        
                 "start": {

     

       92
       -
                   "line": 15,

     

       93
        
                   "offset": 7,

     

       94
        
                 },

     

       95
        
                 "text": "Cannot query field \\"__typenam\\" on type \\"Post\\".",

     
···

       124
        
           expect(res?.body.displayString).toEqual(

     

       125
        
             `Query.posts: [Post]\n\nList out all posts`

     

       126
        
           );

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       127
        
         }, 30000);

     

       128
        
       });

···

       4
        
       import fs from 'node:fs';

     

       5
        
       import url from 'node:url';

     

       6
        
       import ts from 'typescript/lib/tsserverlibrary';

     

       0
        
       
     

       7
        
       

     

       8
        
       const __dirname = path.dirname(url.fileURLToPath(import.meta.url));

     

       9
        
       

     

       10
        
       const projectPath = path.resolve(__dirname, 'fixture-project');

     

       11
       +
       describe('Fragment + operations', () => {

     

       12
        
         const outfileCombinations = path.join(projectPath, 'Combination.ts');

     

       13
        
       

     

       14
        
         let server: TSServer;

     
···

       84
        
                 "category": "error",

     

       85
        
                 "code": 52001,

     

       86
        
                 "end": {

     

       87
       +
                   "line": 17,

     

       88
        
                   "offset": 1,

     

       89
        
                 },

     

       90
        
                 "start": {

     

       91
       +
                   "line": 16,

     

       92
        
                   "offset": 7,

     

       93
        
                 },

     

       94
        
                 "text": "Cannot query field \\"__typenam\\" on type \\"Post\\".",

     
···

       123
        
           expect(res?.body.displayString).toEqual(

     

       124
        
             `Query.posts: [Post]\n\nList out all posts`

     

       125
        
           );

     

       126
       +
         }, 30000);

     

       127
       +
       

     

       128
       +
         it('gives suggestions with preceding fragments', async () => {

     

       129
       +
           server.send({

     

       130
       +
             seq: 10,

     

       131
       +
             type: 'request',

     

       132
       +
             command: 'completionInfo',

     

       133
       +
             arguments: {

     

       134
       +
               file: outfileCombinations,

     

       135
       +
               line: 15,

     

       136
       +
               offset: 7,

     

       137
       +
               includeExternalModuleExports: true,

     

       138
       +
               includeInsertTextCompletions: true,

     

       139
       +
               triggerKind: 1,

     

       140
       +
             },

     

       141
       +
           });

     

       142
       +
       

     

       143
       +
           await server.waitForResponse(

     

       144
       +
             response =>

     

       145
       +
               response.type === 'response' && response.command === 'completionInfo'

     

       146
       +
           );

     

       147
       +
       

     

       148
       +
           const res = server.responses

     

       149
       +
             .reverse()

     

       150
       +
             .find(

     

       151
       +
               resp => resp.type === 'response' && resp.command === 'completionInfo'

     

       152
       +
             );

     

       153
       +
       

     

       154
       +
           expect(res).toBeDefined();

     

       155
       +
           expect(typeof res?.body.entries).toEqual('object');

     

       156
       +
           expect(res?.body.entries).toMatchInlineSnapshot(`

     

       157
       +
             [

     

       158
       +
               {

     

       159
       +
                 "kind": "var",

     

       160
       +
                 "kindModifiers": "declare",

     

       161
       +
                 "labelDetails": {

     

       162
       +
                   "detail": " ID!",

     

       163
       +
                 },

     

       164
       +
                 "name": "id",

     

       165
       +
                 "sortText": "0id",

     

       166
       +
               },

     

       167
       +
               {

     

       168
       +
                 "kind": "var",

     

       169
       +
                 "kindModifiers": "declare",

     

       170
       +
                 "labelDetails": {

     

       171
       +
                   "detail": " String!",

     

       172
       +
                 },

     

       173
       +
                 "name": "title",

     

       174
       +
                 "sortText": "1title",

     

       175
       +
               },

     

       176
       +
               {

     

       177
       +
                 "kind": "var",

     

       178
       +
                 "kindModifiers": "declare",

     

       179
       +
                 "labelDetails": {

     

       180
       +
                   "detail": " String!",

     

       181
       +
                 },

     

       182
       +
                 "name": "content",

     

       183
       +
                 "sortText": "2content",

     

       184
       +
               },

     

       185
       +
               {

     

       186
       +
                 "kind": "var",

     

       187
       +
                 "kindModifiers": "declare",

     

       188
       +
                 "labelDetails": {

     

       189
       +
                   "description": "The name of the current Object type at runtime.",

     

       190
       +
                   "detail": " String!",

     

       191
       +
                 },

     

       192
       +
                 "name": "__typename",

     

       193
       +
                 "sortText": "3__typename",

     

       194
       +
               },

     

       195
       +
             ]

     

       196
       +
           `);

     

       197
        
         }, 30000);

     

       198
        
       });

test/e2e/fixture-project/fixtures/Combination.ts