Merge branch 'develop'

Author: Cesar4D

Package/C4DWizard.dpk

@@ -130,6 +130,10 @@ contains
   C4D.Wizard.UsesOrganization.ListOfUses in '..\Src\UsesOrganization\C4D.Wizard.UsesOrganization.ListOfUses.pas',
   C4D.Wizard.FormatSource.View in '..\Src\FormatSource\C4D.Wizard.FormatSource.View.pas' {C4DWizardFormatSourceView},
   C4D.Wizard.Notes.View in '..\Src\Notes\C4D.Wizard.Notes.View.pas' {C4DWizardNotesView},
-  C4D.Wizard.Utils.OTA.Codex in '..\Src\Utils\C4D.Wizard.Utils.OTA.Codex.pas';
+  C4D.Wizard.Utils.OTA.Codex in '..\Src\Utils\C4D.Wizard.Utils.OTA.Codex.pas',
+  C4D.Wizard.VsCodeIntegration in '..\Src\VsCodeIntegration\C4D.Wizard.VsCodeIntegration.pas',
+  C4D.Wizard.IDE.ToolBars.VsCodeIntegration in '..\Src\IDE\ToolBars\C4D.Wizard.IDE.ToolBars.VsCodeIntegration.pas',
+  C4D.Wizard.IDE.ToolBars.Utils in '..\Src\IDE\ToolBars\C4D.Wizard.IDE.ToolBars.Utils.pas',
+  C4D.Wizard.IDE.MainMenu.VsCodeIntegration in '..\Src\IDE\MainMenu\C4D.Wizard.IDE.MainMenu.VsCodeIntegration.pas';
 
 end.

Package/C4DWizard.dproj

@@ -292,6 +292,10 @@
             <FormType>dfm</FormType>
         </DCCReference>
         <DCCReference Include="..\Src\Utils\C4D.Wizard.Utils.OTA.Codex.pas"/>
+        <DCCReference Include="..\Src\VsCodeIntegration\C4D.Wizard.VsCodeIntegration.pas"/>
+        <DCCReference Include="..\Src\IDE\ToolBars\C4D.Wizard.IDE.ToolBars.VsCodeIntegration.pas"/>
+        <DCCReference Include="..\Src\IDE\ToolBars\C4D.Wizard.IDE.ToolBars.Utils.pas"/>
+        <DCCReference Include="..\Src\IDE\MainMenu\C4D.Wizard.IDE.MainMenu.VsCodeIntegration.pas"/>
         <RcItem Include="Img\C4D_Logo.bmp">
             <ResourceType>BITMAP</ResourceType>
             <ResourceId>C4D_Logo</ResourceId>
@@ -424,6 +428,10 @@
             <ResourceType>BITMAP</ResourceType>
             <ResourceId>c4d_clean_and_start</ResourceId>
         </RcItem>
+        <RcItem Include="Img\c4d_vscode.bmp">
+            <ResourceType>BITMAP</ResourceType>
+            <ResourceId>c4d_vscode</ResourceId>
+        </RcItem>
         <BuildConfiguration Include="Release">
             <Key>Cfg_2</Key>
             <CfgParent>Base</CfgParent>

Package/Img/c4d_vscode.bmp

@@ -103,6 +103,16 @@   TC4DConsts = class
     MENU_IDE_FormatSource_CAPTION = 'Format Source';
     MENU_IDE_NOTES_NAME = 'C4DWizarNotes1';
     MENU_IDE_NOTES_CAPTION = 'Notes';
+    MENU_IDE_VSCODE_INTEGRATION_NAME = 'C4DWizarVsCodeIntegration1';
+    MENU_IDE_VSCODE_INTEGRATION_CAPTION = 'Vs Code Integration';
+    MENU_IDE_VSCODE_INTEGRATION_OPEN_NAME = 'C4DWizarVsCodeIntegrationOpen1';
+    MENU_IDE_VSCODE_INTEGRATION_OPEN_CAPTION = 'Open In VS Code';
+    MENU_IDE_VSCODE_INTEGRATION_INSTALL_DELPHILSP_NAME = 'C4DWizarVsCodeIntegrationInstallDelphiLSP1';
+    MENU_IDE_VSCODE_INTEGRATION_INSTALL_DELPHILSP_CAPTION = 'Install DelphiLSP extension in VS Code';
+    MENU_IDE_VSCODE_INTEGRATION_INSTALL_GithubCopilot_NAME = 'C4DWizarVsCodeIntegrationInstallGithubCopilot1';
+    MENU_IDE_VSCODE_INTEGRATION_INSTALL_GithubCopilot_CAPTION = 'Install GitHub Copilot extension in VS Code';
+    MENU_IDE_VSCODE_INTEGRATION_INSTALL_Supermaven_NAME = 'C4DWizarVsCodeIntegrationInstallSupermaven1';
+    MENU_IDE_VSCODE_INTEGRATION_INSTALL_Supermaven_CAPTION = 'Install GitHub Supermaven extension in VS Code';
 
     //FILE .INI REOPEN
     REOPEN_INI_Favorite = 'Favorite';
@@ -171,6 +181,14 @@   TC4DConsts = class
     //TOOLBAR UTILITIES INI
     TOOL_BAR_UTILITIES_INI_Visible = 'Visible';
 
+    //TOOLBAR VS Code Integration
+    TOOL_BAR_VsCodeIntegration_NAME = 'C4DToolBarVsCodeIntegration';
+    TOOL_BAR_VsCodeIntegration_CAPTION = 'C4D VS Code Integration';
+    TOOL_BAR_VsCodeIntegration_TOOL_BUTTON_OpenInVsCode_NAME = 'C4DToolButtoVsCodeIntegrationOpen';
+    TOOL_BAR_VsCodeIntegration_TOOL_BUTTON_OpenInVsCode_CAPTION = 'Open In VS Code';
+    //TOOLBAR VS Code Integration INI
+    TOOL_BAR_VsCodeIntegration_INI_Visible = 'Visible';
+
     EXTENSIONS_PERMITTED_BACKUP_EXPORT: TC4DExtensionsOfFiles = [TC4DExtensionsFiles.INI,
       TC4DExtensionsFiles.BMP];
 

Src/Consts/C4D.Wizard.Consts.pas

@@ -28,7 +28,8 @@ implementation
   C4D.Wizard.Consts,
   C4D.Wizard.Utils,
   C4D.Wizard.Utils.OTA,
-  C4D.Wizard.Settings.Model;
+  C4D.Wizard.Settings.Model,
+  C4D.Wizard.ProcessDelphi;
 
 var
   IndexNotifier: Integer = -1;
@@ -53,6 +54,7 @@ procedure TC4DWizardIDECompileNotifier.ProjectCompileStarted(const Project: IOTA
 var
   LIOTAProject: IOTAProject;
   LCurrentBinaryPath: string;
+  LCommand: string;
 begin
   if(not C4DWizardSettingsModel.BeforeCompilingCheckRunning)then
     Exit;
@@ -67,8 +69,12 @@ procedure TC4DWizardIDECompileNotifier.ProjectCompileStarted(const Project: IOTA
   begin
     if(TC4DWizardUtils.ProcessWindowsExists(ExtractFileName(LCurrentBinaryPath), LCurrentBinaryPath))then
     begin
-      if(not TC4DWizardUtils.ShowQuestion2('The application is already running, do you wish to continue?'))then
+      if(not TC4DWizardUtils.ShowQuestion2('The application is already running, do you wish to continue (Kills current process)?'))then
         Abort;
+
+      LCommand := 'taskkill /f /IM ' + ExtractFileName(Project.ProjectOptions.TargetName);
+      TC4DWizardProcessDelphi.RunCommand([LCommand]);
+      Sleep(1000);
     end;
   end;
 end;

Src/IDE/CompileNotifier/C4D.Wizard.IDE.CompileNotifier.pas

@@ -80,9 +80,9 @@ procedure TC4DWizardIDEEditServicesNotifier.EditorViewActivated(const EditWindow
 procedure TC4DWizardIDEEditServicesNotifier.EditorViewModified(const EditWindow: INTAEditWindow; const EditView: IOTAEditView);
 begin
 //  AddLogInternal('EditorViewModified: ' +
-//    ' Linha atual: ' + EditView.Buffer.EditPosition.Row.Tostring +
-//    ' Coluna atual: ' + EditView.Buffer.EditPosition.Column.Tostring +
-//    ' Ultima linha: ' + EditView.Buffer.EditPosition.LastRow.Tostring);
+//    ' Linha atual: ' + EditView.Buffer.EditPosition.Row.ToString +
+//    ' Coluna atual: ' + EditView.Buffer.EditPosition.Column.ToString +
+//    ' Ultima linha: ' + EditView.Buffer.EditPosition.LastRow.ToString);
 end;
 
 procedure TC4DWizardIDEEditServicesNotifier.WindowActivated(const EditWindow: INTAEditWindow);
@@ -92,7 +92,7 @@ procedure TC4DWizardIDEEditServicesNotifier.WindowActivated(const EditWindow: IN
 
 procedure TC4DWizardIDEEditServicesNotifier.WindowCommand(const EditWindow: INTAEditWindow; Command, Param: Integer; var Handled: Boolean);
 begin
-  //AddLogInternal('WindowCommand: Command: ' + Command.Tostring +  ' - Param: '   + Param.Tostring);
+  //AddLogInternal('WindowCommand: Command: ' + Command.ToString +  ' - Param: '   + Param.ToString);
   //if(Command = 22)then
   //begin
   //  ShowMessage('Você teclou Ctrl + C e essa opção não é permitida');

Src/IDE/EditServicesNotifier/C4D.Wizard.IDE.EditServicesNotifier.pas

@@ -37,6 +37,7 @@   TC4DWizardIDEImageListMain = class
     FImgIndexVerifyDocument: Integer;
     FImgIndexNotes: Integer;
     FImgIndexCleanAndStart: Integer;
+    FImgIndexVsCode: Integer;
     constructor Create;
   public
     property ImgIndexC4D_Logo: Integer read FImgIndexC4D_Logo;
@@ -67,6 +68,7 @@   TC4DWizardIDEImageListMain = class
     property ImgIndexVerifyDocument: Integer read FImgIndexVerifyDocument;
     property ImgIndexNotes: Integer read FImgIndexNotes;
     property ImgIndexCleanAndStart: Integer read FImgIndexCleanAndStart;
+    property ImgIndexVsCode: Integer read FImgIndexVsCode;
     class function GetInstance: TC4DWizardIDEImageListMain;
   end;
 
@@ -115,6 +117,7 @@ constructor TC4DWizardIDEImageListMain.Create;
   FImgIndexVerifyDocument := TC4DWizardUtilsOTA.AddImgIDEResourceName('c4d_verify_document');
   FImgIndexNotes := TC4DWizardUtilsOTA.AddImgIDEResourceName('c4d_notes');
   FImgIndexCleanAndStart := TC4DWizardUtilsOTA.AddImgIDEResourceName('c4d_clean_and_start');
+  FImgIndexVsCode := TC4DWizardUtilsOTA.AddImgIDEResourceName('c4d_vscode');
 end;
 
 initialization

Src/IDE/ImageListMain/C4D.Wizard.IDE.ImageListMain.pas

@@ -9,7 +9,7 @@ interface
   C4D.Wizard.Backup.Interfaces;
 
 type
-  TC4DWizardIDEMainMenuBakcups = class(TInterfacedObject, IC4DWizardIDEMainMenuBackup)
+  TC4DWizardIDEMainMenuBackup = class(TInterfacedObject, IC4DWizardIDEMainMenuBackup)
   private
     FMenuItemC4D: TMenuItem;
     FMenuItemSave: TMenuItem;
@@ -30,24 +30,24 @@ implementation
   C4D.Wizard.IDE.ImageListMain,
   C4D.Wizard.IDE.MainMenu.Clicks;
 
-class function TC4DWizardIDEMainMenuBakcups.New(AMenuItemParent: TMenuItem): IC4DWizardIDEMainMenuBackup;
+class function TC4DWizardIDEMainMenuBackup.New(AMenuItemParent: TMenuItem): IC4DWizardIDEMainMenuBackup;
 begin
   Result := Self.Create(AMenuItemParent);
 end;
 
-constructor TC4DWizardIDEMainMenuBakcups.Create(AMenuItemParent: TMenuItem);
+constructor TC4DWizardIDEMainMenuBackup.Create(AMenuItemParent: TMenuItem);
 begin
   FMenuItemC4D := AMenuItemParent;
 end;
 
-function TC4DWizardIDEMainMenuBakcups.Process: IC4DWizardIDEMainMenuBackup;
+function TC4DWizardIDEMainMenuBackup.Process: IC4DWizardIDEMainMenuBackup;
 begin
   Self.AddMenuItemSave;
   Self.AddMenuItemExport;
   Self.AddMenuItemImport;
 end;
 
-procedure TC4DWizardIDEMainMenuBakcups.AddMenuItemSave;
+procedure TC4DWizardIDEMainMenuBackup.AddMenuItemSave;
 begin
   FMenuItemSave := TMenuItem.Create(FMenuItemC4D);
   FMenuItemSave.Name := TC4DConsts.MENU_IDE_BACKUP_NAME;
@@ -56,7 +56,7 @@ procedure TC4DWizardIDEMainMenuBakcups.AddMenuItemSave;
   FMenuItemC4D.Add(FMenuItemSave);
 end;
 
-procedure TC4DWizardIDEMainMenuBakcups.AddMenuItemExport;
+procedure TC4DWizardIDEMainMenuBackup.AddMenuItemExport;
 var
   LItemExport: TMenuItem;
 begin
@@ -68,7 +68,7 @@ procedure TC4DWizardIDEMainMenuBakcups.AddMenuItemExport;
   FMenuItemSave.Add(LItemExport);
 end;
 
-procedure TC4DWizardIDEMainMenuBakcups.AddMenuItemImport;
+procedure TC4DWizardIDEMainMenuBackup.AddMenuItemImport;
 var
   LItemImport: TMenuItem;
 begin

Src/IDE/MainMenu/C4D.Wizard.IDE.MainMenu.Backup.pas

@@ -21,6 +21,10 @@   TC4DWizardIDEMainMenuClicks = class
     class procedure FindClick(Sender: TObject);
     class procedure ReplaceClick(Sender: TObject);
     class procedure NotesClick(Sender: TObject);
+    class procedure VsCodeIntegrationOpenInVsCodeClick(Sender: TObject);
+    class procedure VsCodeIntegrationInstallDelphiLSPClick(Sender: TObject);
+    class procedure VsCodeIntegrationInstallGithubCopilotClick(Sender: TObject);
+    class procedure VsCodeIntegrationInstallSupermavenClick(Sender: TObject);
     class procedure DefaultFilesInOpeningProjectClick(Sender: TObject);
     class procedure BackupExportClick(Sender: TObject);
     class procedure BackupImportClick(Sender: TObject);
@@ -52,7 +56,8 @@ implementation
   C4D.Wizard.View.About,
   C4D.Wizard.DefaultFilesInOpeningProject,
   C4D.Wizard.FormatSource.View,
-  C4D.Wizard.Notes.View;
+  C4D.Wizard.Notes.View,
+  C4D.Wizard.VsCodeIntegration;
 
 class procedure TC4DWizardIDEMainMenuClicks.UsesOrganizationClick(Sender: TObject);
 var
@@ -132,11 +137,30 @@ class procedure TC4DWizardIDEMainMenuClicks.NotesClick(Sender: TObject);
   C4D.Wizard.Notes.View.C4DWizardNotesViewShowDockableForm;
 end;
 
+class procedure TC4DWizardIDEMainMenuClicks.VsCodeIntegrationOpenInVsCodeClick(Sender: TObject);
+begin
+  TC4DWizardVsCodeIntegration.Open;
+end;
+
+class procedure TC4DWizardIDEMainMenuClicks.VsCodeIntegrationInstallDelphiLSPClick(Sender: TObject);
+begin
+  TC4DWizardVsCodeIntegration.InstallDelphiLSP;
+end;
+
+
+class procedure TC4DWizardIDEMainMenuClicks.VsCodeIntegrationInstallGithubCopilotClick(Sender: TObject);
+begin
+  TC4DWizardVsCodeIntegration.InstallGithubCopilot;
+end;
+
+class procedure TC4DWizardIDEMainMenuClicks.VsCodeIntegrationInstallSupermavenClick(Sender: TObject);
+begin
+  TC4DWizardVsCodeIntegration.InstallSupermaven;
+end;
+
 class procedure TC4DWizardIDEMainMenuClicks.DefaultFilesInOpeningProjectClick(Sender: TObject);
 begin
-  TC4DWizardDefaultFilesInOpeningProject
-    .New(Self.GetFileNameCurrentProject)
-    .SelectionFilesForDefaultOpening;
+  TC4DWizardDefaultFilesInOpeningProject.New(Self.GetFileNameCurrentProject).SelectionFilesForDefaultOpening;
 end;
 
 class procedure TC4DWizardIDEMainMenuClicks.BackupExportClick(Sender: TObject);

Src/IDE/MainMenu/C4D.Wizard.IDE.MainMenu.Clicks.pas

@@ -196,7 +196,7 @@ function TC4DWizardIDEMainMenuOpenExternal.CreateSubMenu(const AMenuItemParent:
   LMenuItem: TMenuItem;
 begin
   LMenuItem := TMenuItem.Create(AMenuItemParent);
-  LMenuItem.Name := 'C4DOpenExternalItemMenu' + TC4DWizardUtils.IncInt(FCont).Tostring;
+  LMenuItem.Name := 'C4DOpenExternalItemMenu' + TC4DWizardUtils.IncInt(FCont).ToString;
   LMenuItem.Caption := AC4DWizardOpenExternal.Description;
   LMenuItem.OnClick := Self.ItemMenuClick;
   LMenuItem.Hint := AC4DWizardOpenExternal.Path + TC4DConsts.OPEN_EXTERNAL_Separator_PARAMETERS + AC4DWizardOpenExternal.Parameters;