administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

fix pascalabcnet/pascalabcnetide#128

Browse source
This commit is contained in:
Бондарев Иван 2019-06-20 12:00:39 +02:00
parent 783c34e45d
commit 56e00313ea
3 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CodeCompletion/DomSyntaxTreeVisitor.cs
View file

@ -2197,7 +2197,7 @@ namespace CodeCompletion
}
//add_standart_types_simple();
Stack<Position> regions_stack = new Stack<Position>();
if (CodeCompletionController.comp.CompilerOptions.CurrentProject != null && CodeCompletionController.comp.CompilerOptions.CurrentProject.ContainsSourceFile(_unit_module.file_name))
if (CodeCompletionController.comp != null && CodeCompletionController.comp.CompilerOptions.CurrentProject != null && CodeCompletionController.comp.CompilerOptions.CurrentProject.ContainsSourceFile(_unit_module.file_name))
{
IReferenceInfo[] refs = CodeCompletionController.comp.CompilerOptions.CurrentProject.References;
if (_unit_module.compiler_directives == null)
@ -2407,7 +2407,7 @@ namespace CodeCompletion
cur_scope = unit_scope = new InterfaceUnitScope(new SymInfo("", SymbolKind.Namespace, "program"), null);
CodeCompletionController.comp_modules[_program_module.file_name] = this.converter;
Stack<Position> regions_stack = new Stack<Position>();
if (CodeCompletionController.comp.CompilerOptions.CurrentProject != null && CodeCompletionController.comp.CompilerOptions.CurrentProject.ContainsSourceFile(_program_module.file_name))
if (CodeCompletionController.comp != null && CodeCompletionController.comp.CompilerOptions.CurrentProject != null && CodeCompletionController.comp.CompilerOptions.CurrentProject.ContainsSourceFile(_program_module.file_name))
{
IReferenceInfo[] refs = CodeCompletionController.comp.CompilerOptions.CurrentProject.References;
if (_program_module.compiler_directives == null)

5
VisualPascalABCNET/DS/VisualEnvironmentCompiler.cs
View file

@ -139,6 +139,11 @@ namespace VisualPascalABC
{
standartCompiler = new PascalABCCompiler.Compiler(SourceFilesProvider, OnChangeCompilerState);
CodeCompletion.CodeCompletionController.comp = new PascalABCCompiler.Compiler((PascalABCCompiler.Compiler)standartCompiler, SourceFilesProvider, OnChangeCompilerState);
if (ProjectFactory.Instance.CurrentProject != null)
{
CodeCompletion.CodeCompletionController.comp.CompilerOptions.CurrentProject = ProjectFactory.Instance.CurrentProject;
ProjectFactory.Instance.Dirty = true;
}
CodeCompletion.CodeCompletionController.ParsersController = standartCompiler.ParsersController;
CodeCompletion.CodeCompletionController.StandartDirectories = StandartDirectories;

2
VisualPascalABCNET/Workbench/ProjectService.cs
View file

@ -14,7 +14,7 @@ namespace VisualPascalABC
public partial class Form1 : IWorkbenchProjectService
{
public List<string> LastOpenProjects;
public void NewProject()
{
NewProjectForm npf = new NewProjectForm();