refactor: cleaning up imports

Author: DaanV2

server/src/lib/lsp/code-action/context.ts

@@ -1,5 +1,4 @@
-import { WorkDoneProgressReporter } from 'vscode-languageserver';
-import { CancellationToken, CodeActionParams } from 'vscode-languageserver-protocol';
+import { CancellationToken, CodeActionParams, WorkDoneProgressReporter } from 'vscode-languageserver';
 import { TextDocument } from '../documents/text-document';
 
 export interface CodeActionContext extends Pick<CodeActionParams, "context" | "range"> {

server/src/lib/lsp/code-action/service.ts

@@ -1,11 +1,9 @@
-import { Connection, WorkDoneProgressReporter } from "vscode-languageserver";
 import {
   CancellationToken,
   CodeAction,
   CodeActionParams,
-  Command,
-  Diagnostic
-} from "vscode-languageserver-protocol";
+  Command, Connection, Diagnostic, WorkDoneProgressReporter
+} from "vscode-languageserver";
 import { Context } from "../context/context";
 import { ExtensionContext } from "../extension";
 import { IExtendedLogger } from "../logger/logger";

server/src/lib/lsp/code-lens/service.ts

@@ -1,5 +1,4 @@
-import { Connection, WorkDoneProgressReporter } from "vscode-languageserver";
-import { CancellationToken, CodeLens, CodeLensParams } from "vscode-languageserver-protocol";
+import { CancellationToken, CodeLens, CodeLensParams, Connection, WorkDoneProgressReporter } from "vscode-languageserver";
 import { Context } from "../context/context";
 import { ExtensionContext } from "../extension";
 import { IExtendedLogger } from "../logger/logger";

server/src/lib/lsp/commands/service.ts

@@ -1,5 +1,4 @@
-import { Connection, WorkDoneProgressReporter } from "vscode-languageserver";
-import { CancellationToken, ExecuteCommandParams } from "vscode-languageserver-protocol";
+import { CancellationToken, Connection, ExecuteCommandParams, WorkDoneProgressReporter } from "vscode-languageserver";
 import { Context } from "../context/context";
 import { ExtensionContext } from "../extension";
 import { IExtendedLogger } from "../logger/logger";

server/src/lib/lsp/completion/general/manifests.ts

@@ -1,4 +1,4 @@
-import { CompletionItemKind } from "vscode-languageserver-types";
+import { CompletionItemKind } from "vscode-languageserver";
 import { Context } from "../../context/context";
 import { JsonPathCompletion } from "../builder";
 import { CompletionContext } from "../context";

server/src/lib/lsp/completion/general/strings.ts

@@ -1,4 +1,4 @@
-import { CompletionItemKind } from "vscode-languageserver-types";
+import { CompletionItemKind } from "vscode-languageserver";
 import { Context } from "../../context/context";
 import { CompletionContext } from "../context";
 

server/src/lib/lsp/completion/minecraft/commands/commands.ts

@@ -1,5 +1,4 @@
 import { CommandData, CommandInfo } from "bc-minecraft-bedrock-command";
-import { SMap } from "bc-minecraft-bedrock-project";
 import { Kinds } from "../../../../constants";
 import { IsEducationEnabled } from "../../../../project/attributes";
 import { Context } from "../../../context/context";
@@ -13,12 +12,12 @@ import { CompletionContext } from "../../context";
 export function provideCompletion(context: Context<CompletionContext>): void {
   const edu = IsEducationEnabled(context.document);
 
-  Object.values(CommandData.Vanilla, (data) => getCompletion(data, context.builder));
-  if (edu) Object.values(CommandData.Edu, (data) => getCompletion(data, context.builder));
+  Object.values(CommandData.Vanilla).forEach((data) => getCompletion(data, context.builder));
+  if (edu) Object.values(CommandData.Edu).forEach((data) => getCompletion(data, context.builder));
 }
 
 export function provideExecuteSubcommandCompletion(context: Context<CompletionContext>): void {
-  Object.values(CommandData.ExecuteSubcommands, (data) => getCompletion(data, context.builder));
+  Object.values(CommandData.ExecuteSubcommands).forEach((data) => getCompletion(data, context.builder));
 }
 
 /**

server/src/lib/lsp/completion/minecraft/mcfunctions/mcfunctions.ts

@@ -1,5 +1,5 @@
 import { Command } from "bc-minecraft-bedrock-command";
-import { CompletionItemKind } from "vscode-languageserver-types";
+import { CompletionItemKind } from "vscode-languageserver";
 import { IsEducationEnabled } from "../../../../project/attributes";
 import { Context } from "../../../context/context";
 import { CommandCompletionContext, CompletionContext } from "../../context";

server/src/lib/lsp/completion/minecraft/mcproject/mcproject.ts

@@ -1,6 +1,6 @@
 import { Documentated, Identifiable } from "bc-minecraft-bedrock-types/lib/types";
 import { MCAttributes, MCDefinition, MCIgnore } from "bc-minecraft-project";
-import { CompletionItemKind, MarkupContent } from "vscode-languageserver-types";
+import { CompletionItemKind, MarkupContent } from "vscode-languageserver";
 import { TemplateCommands } from "../../../commands/commands/templates";
 import { Context } from "../../../context/context";
 import { CompletionContext } from "../../context";
@@ -123,7 +123,7 @@ function provideDefinitions(context: Context<CompletionContext>): void {
 
       case "family":
         return projectData.behaviorPacks.entities.forEach((entity) =>
-          entity.families.forEach((family) => add(context, family))
+          entity.families.defined.forEach((family) => add(context, family))
         );
 
       case "function":

server/src/lib/lsp/completion/minecraft/molang/main.ts

@@ -1,6 +1,6 @@
 import { Languages } from "@blockception/shared";
 import { PackType } from "bc-minecraft-bedrock-project";
-import { CompletionItemKind } from "vscode-languageserver-types";
+import { CompletionItemKind } from "vscode-languageserver";
 import { getPreviousWord, IsMolang } from "../../../../minecraft/molang/functions";
 import { Context } from "../../../context/context";
 import { CompletionContext } from "../../context";