++
фикс падения при поиске зависимостей
This commit is contained in:
@@ -38,26 +38,38 @@ public class SPF_GetIncludeDependencies extends SapforAnalysis {
|
||||
IncludesJson includesJson = Utils_.gson.fromJson(packed, IncludesJson.class);
|
||||
update_current = false;
|
||||
for (FileIncludesJson fileIncludesJson : includesJson.allIncludes) {
|
||||
//-
|
||||
fileIncludesJson.file = Utils_.toW(fileIncludesJson.file);
|
||||
//--
|
||||
FileInfo fileInfo = new FileInfo(fileIncludesJson.file);
|
||||
//---
|
||||
DBProjectFile file = target.db.files.get(fileIncludesJson.file);
|
||||
System.out.println("addicted file = "+Utils_.Brackets(fileIncludesJson.file));
|
||||
System.out.println("found dependencies :"+fileIncludesJson.includes.size());
|
||||
for (Include include : fileIncludesJson.includes) {
|
||||
//--
|
||||
include.dependencyFileName = Utils_.toW(include.dependencyFileName);
|
||||
//--
|
||||
fileInfo.dependencies.add(include);
|
||||
if (!target.allIncludes.contains(include.file))
|
||||
target.allIncludes.add(include.file);
|
||||
//- определение типов языков инклудов по файлу куда они цепляютс.
|
||||
if (!file.dependencies.contains(include.dependencyFileName)) {
|
||||
file.dependencies.add(include.dependencyFileName);
|
||||
//---
|
||||
DBProjectFile include_file = target.db.files.get(include.dependencyFileName);
|
||||
include_file.UpdateType(FileType.header);
|
||||
if (include_file.languageName == LanguageName.n)
|
||||
include_file.UpdateLanguage(file.languageName);
|
||||
if (include_file.style == LanguageStyle.none)
|
||||
include_file.UpdateStyle(file.style);
|
||||
if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(include_file.name))
|
||||
update_current = true;
|
||||
if (target.db.files.containsKey(include.dependencyFileName)){
|
||||
//- определение типов языков инклудов по файлу куда они цепляютс.
|
||||
if (!file.dependencies.contains(include.dependencyFileName)) {
|
||||
file.dependencies.add(include.dependencyFileName);
|
||||
//---
|
||||
DBProjectFile include_file = target.db.files.get(include.dependencyFileName);
|
||||
include_file.UpdateType(FileType.header);
|
||||
if (include_file.languageName == LanguageName.n)
|
||||
include_file.UpdateLanguage(file.languageName);
|
||||
if (include_file.style == LanguageStyle.none)
|
||||
include_file.UpdateStyle(file.style);
|
||||
if (Global.mainModule.HasFile() && Global.mainModule.getFile().name.equals(include_file.name))
|
||||
update_current = true;
|
||||
}
|
||||
|
||||
}else {
|
||||
System.out.println(Utils_.Brackets(include.dependencyFileName)+" не существует!");
|
||||
}
|
||||
}
|
||||
//----
|
||||
|
||||
Reference in New Issue
Block a user