Skip to content

Commit 3e43d4c

Browse files
znorman-harrisznorman-harris
committed
Rename class for file types
1 parent f433d9e commit 3e43d4c

16 files changed

Lines changed: 49 additions & 52 deletions

File tree

‎libs/parsing/index/src/lib/auto-complete/completion-for/add-completion-include.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ExtensionFileType } from '@idl/shared';
1+
import { IDLFileHelper } from '@idl/shared';
22
import { basename } from 'path';
33
import { CompletionItem, CompletionItemKind } from 'vscode-languageserver';
44

@@ -19,7 +19,7 @@ export function AddCompletionInclude(
1919
// process all files
2020
for (let i = 0; i < files.length; i++) {
2121
// skip if not PRO file
22-
if (!ExtensionFileType.isPROCode(files[i])) {
22+
if (!IDLFileHelper.isPROCode(files[i])) {
2323
continue;
2424
}
2525

‎libs/parsing/index/src/lib/get-parsed/get-parsed-pro-code.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { CancellationToken } from '@idl/cancellation-tokens';
22
import { CodeChecksum } from '@idl/parser';
33
import { IParsed } from '@idl/parsing/syntax-tree';
4-
import { ExtensionFileType } from '@idl/shared';
4+
import { IDLFileHelper } from '@idl/shared';
55
import { LSP_WORKER_THREAD_MESSAGE_LOOKUP } from '@idl/workers/parsing';
66
import copy from 'fast-copy';
77

@@ -80,7 +80,7 @@ export async function GetParsedPROCode(
8080
/**
8181
* Check if we are a notebook cell
8282
*/
83-
case ExtensionFileType.isIDLNotebookFile(file): {
83+
case IDLFileHelper.isIDLNotebookFile(file): {
8484
/**
8585
* If we have a pending notebook file, pause
8686
* and wait for it to finish before we do anything

‎libs/parsing/index/src/lib/idl-index.class.ts‎

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { LoadConfig } from '@idl/schemas/idl.json';
1717
import { LoadTask } from '@idl/schemas/tasks';
1818
import {
1919
ALL_FILES_GLOB_PATTERN,
20-
ExtensionFileType,
20+
IDLFileHelper,
2121
NODE_MEMORY_CONFIG,
2222
SystemMemoryUsedMB,
2323
} from '@idl/shared';
@@ -370,7 +370,7 @@ export class IDLIndex {
370370
// track down our include
371371
for (let i = 0; i < files.length; i++) {
372372
// skip if not PRO file
373-
if (!ExtensionFileType.isPROCode(files[i])) {
373+
if (!IDLFileHelper.isPROCode(files[i])) {
374374
continue;
375375
}
376376

@@ -611,10 +611,7 @@ export class IDLIndex {
611611
): Promise<DocumentSymbol[]> {
612612
// if document isnt PRO code, return
613613
if (
614-
!(
615-
ExtensionFileType.isPROCode(file) ||
616-
ExtensionFileType.isIDLNotebookFile(file)
617-
)
614+
!(IDLFileHelper.isPROCode(file) || IDLFileHelper.isIDLNotebookFile(file))
618615
) {
619616
return undefined;
620617
}
@@ -967,7 +964,7 @@ export class IDLIndex {
967964

968965
// automatically detect if we are a notebook file
969966
if (!options.isNotebook) {
970-
options.isNotebook = ExtensionFileType.isIDLNotebookFile(file);
967+
options.isNotebook = IDLFileHelper.isIDLNotebookFile(file);
971968
}
972969

973970
// get old global tokens
@@ -1326,19 +1323,19 @@ export class IDLIndex {
13261323
// process all files
13271324
for (let i = 0; i < files.length; i++) {
13281325
switch (true) {
1329-
case ExtensionFileType.isPROCode(files[i]):
1326+
case IDLFileHelper.isPROCode(files[i]):
13301327
proFiles.push(files[i]);
13311328
break;
1332-
case ExtensionFileType.isConfigFile(files[i]):
1329+
case IDLFileHelper.isConfigFile(files[i]):
13331330
configFiles.push(files[i]);
13341331
break;
1335-
case ExtensionFileType.isTaskFile(files[i]):
1332+
case IDLFileHelper.isTaskFile(files[i]):
13361333
taskFiles.push(files[i]);
13371334
break;
1338-
case ExtensionFileType.isIDLNotebookFile(files[i]):
1335+
case IDLFileHelper.isIDLNotebookFile(files[i]):
13391336
notebookFiles.push(files[i]);
13401337
break;
1341-
case ExtensionFileType.isSAVEFile(files[i]):
1338+
case IDLFileHelper.isSAVEFile(files[i]):
13421339
saveFiles.push(files[i]);
13431340
break;
13441341
default:
@@ -1488,7 +1485,7 @@ export class IDLIndex {
14881485
// process each file
14891486
for (let i = 0; i < files.length; i++) {
14901487
// check if we dont actually have pro code
1491-
if (!ExtensionFileType.isPROCode(files[i])) {
1488+
if (!IDLFileHelper.isPROCode(files[i])) {
14921489
continue;
14931490
}
14941491

@@ -2242,13 +2239,13 @@ export class IDLIndex {
22422239

22432240
// index appropriately
22442241
switch (true) {
2245-
case ExtensionFileType.isConfigFile(file):
2242+
case IDLFileHelper.isConfigFile(file):
22462243
await this.indexConfigFile(file, code);
22472244
break;
2248-
case ExtensionFileType.isTaskFile(file):
2245+
case IDLFileHelper.isTaskFile(file):
22492246
await this.indexTaskFile(file, code);
22502247
break;
2251-
case ExtensionFileType.isPROCode(file):
2248+
case IDLFileHelper.isPROCode(file):
22522249
await this.getParsedProCode(
22532250
file,
22542251
code,

‎libs/shared/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ export * from './lib/clean-path';
33
export * from './lib/completion-trigger-characters.interface';
44
export * from './lib/dot-idl-folder.interface';
55
export * from './lib/envi-opener.interface';
6-
export * from './lib/extension-file-type.class';
76
export * from './lib/get-extension-path';
87
export * from './lib/get-fs-path';
98
export * from './lib/idl-commands.interface';
9+
export * from './lib/idl-file-helper.class';
1010
export * from './lib/language.interface';
1111
export * from './lib/match-global';
1212
export * from './lib/memory-config.interface';

libs/shared/src/lib/extension-file-type.class.ts renamed to libs/shared/src/lib/idl-file-helper.class.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
*
1212
* Shared logic across the extension
1313
*/
14-
export class ExtensionFileType {
14+
export class IDLFileHelper {
1515
/**
1616
* Indicates if we have a file that we can process for tokens (PRO code).
1717
*

‎libs/vscode/decorations/src/lib/idl-decorations-manager.class.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {
33
IDLCodeCoverage,
44
IDLSyntaxErrorLookup,
55
} from '@idl/idl';
6-
import { ExtensionFileType, Sleep } from '@idl/shared';
6+
import { IDLFileHelper, Sleep } from '@idl/shared';
77
import { IDL_TRANSLATION } from '@idl/translation';
88
import {
99
GetTextEditorForURIString,
@@ -330,9 +330,9 @@ export class IDLDecorationsManager {
330330
private _canResetEntry(file: string, flag: IDLDecorationsResetFlag): boolean {
331331
switch (flag) {
332332
case 'pro':
333-
return ExtensionFileType.isPROCode(file);
333+
return IDLFileHelper.isPROCode(file);
334334
case 'notebook':
335-
return ExtensionFileType.isIDLNotebookFile(file);
335+
return IDLFileHelper.isIDLNotebookFile(file);
336336
default:
337337
return true;
338338
}

‎libs/vscode/server/src/lib/events/custom-events/on-generate-task.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
import { GenerateTaskResult } from '@idl/generators/tasks-shared';
1111
import { IDL_LSP_LOG } from '@idl/logger';
1212
import { TOKEN_NAMES } from '@idl/parsing/tokenizer';
13-
import { ExtensionFileType, GetFSPath, Sleep } from '@idl/shared';
13+
import { IDLFileHelper, GetFSPath, Sleep } from '@idl/shared';
1414
import { IDL_TRANSLATION } from '@idl/translation';
1515
import {
1616
GenerateTaskMessage,
@@ -45,7 +45,7 @@ export const ON_GENERATE_TASK = async (
4545
const fsPath = GetFSPath(payload.uri);
4646

4747
// return if not PRO code
48-
if (!ExtensionFileType.isPROCode(fsPath)) {
48+
if (!IDLFileHelper.isPROCode(fsPath)) {
4949
return;
5050
}
5151

‎libs/vscode/server/src/lib/events/custom-events/on-migrate-code.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { IDL_LSP_LOG } from '@idl/logger';
2-
import { ExtensionFileType } from '@idl/shared';
2+
import { IDLFileHelper } from '@idl/shared';
33
import { IDL_TRANSLATION } from '@idl/translation';
44
import {
55
MigrateCodeLSPPayload,
@@ -44,7 +44,7 @@ export const ON_MIGRATE_CODE = async (
4444
const config = GetFormattingConfigForFile(info.fsPath);
4545

4646
// do nothing
47-
if (!ExtensionFileType.isPROCode(info.fsPath)) {
47+
if (!IDLFileHelper.isPROCode(info.fsPath)) {
4848
return undefined;
4949
}
5050

‎libs/vscode/server/src/lib/events/user-interaction/on-code-action.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { CreateCodeActions } from '@idl/assembling/code-actions';
22
import { IDL_LSP_LOG } from '@idl/logger';
3-
import { ExtensionFileType } from '@idl/shared';
3+
import { IDLFileHelper } from '@idl/shared';
44
import { IDL_TRANSLATION } from '@idl/translation';
55
import { IDLDiagnostic } from '@idl/types/diagnostic';
66
import { CodeAction, CodeActionParams } from 'vscode-languageserver/node';
@@ -48,7 +48,7 @@ export const ON_CODE_ACTIONS = async (
4848
}
4949

5050
// return if not a file we can process
51-
if (!(ExtensionFileType.isPROCode(info.fsPath) || info.isNotebook)) {
51+
if (!(IDLFileHelper.isPROCode(info.fsPath) || info.isNotebook)) {
5252
return undefined;
5353
}
5454

‎libs/vscode/server/src/lib/events/user-interaction/on-completion.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
IAssemblerOptions,
55
} from '@idl/assembling/config';
66
import { IDL_LSP_LOG } from '@idl/logger';
7-
import { ExtensionFileType, GetFSPath } from '@idl/shared';
7+
import { IDLFileHelper, GetFSPath } from '@idl/shared';
88
import { IDL_TRANSLATION } from '@idl/translation';
99
import {
1010
CompletionItem,
@@ -36,8 +36,8 @@ export async function GetAutoCompleteWrapper(
3636
// return if not a file we can process
3737
if (
3838
!(
39-
ExtensionFileType.isPROCode(info.fsPath) ||
40-
ExtensionFileType.isIDLNotebookFile(info.fsPath)
39+
IDLFileHelper.isPROCode(info.fsPath) ||
40+
IDLFileHelper.isIDLNotebookFile(info.fsPath)
4141
)
4242
) {
4343
return undefined;

0 commit comments

Comments
 (0)