Beta-3

Author: dim-s

develnext/launcher/DevelNext.exe

@@ -15,6 +15,7 @@ Bate-3
 - В редакторе кода дополнение кавычек стало происходить более разумным способом.
 - Во внутренней системе IDE была переработана система пакетов и расширений для дальнейшего развития.
 - Исправлен баг с CSS классами, в некоторых случаях классы не применялись к объектам в запущенной программе.
+- Исправлен баг компиляции в байткод, в некоторых случаях возникала ошибка Class not found.
 
 
 Patch-A

develnext/misc/history.txt

@@ -203,6 +203,7 @@ protected function findReturnType(SimpleToken $token, $previousType = null, Auto
     public function identifyType($string, AutoCompleteRegion $region)
     {
         $tokens = SyntaxAnalyzer::analyzeExpressionForDetectType($string);
+
         $type = null;
 
         $accessType = '';

develnext/src/ide/autocomplete/php/PhpBasicAutoCompleteTypeRule.php

@@ -91,6 +91,8 @@ public function __construct($filename)
     public function stopDaemon()
     {
         if ($ide = Ide::get()) {
+            $this->daemon = false;
+
             Logger::info("Stop gradle daemon ...");
 
             $process = new Process(
@@ -100,9 +102,8 @@ public function stopDaemon()
             );
 
             $process->start();
-            $this->daemon = false;
 
-            //Logger::info("Gradle daemon is stopped.");
+            Logger::info("Gradle daemon is stopped.");
         }
     }
 
@@ -120,7 +121,6 @@ public function startDaemon()
                 );
 
                 $process = $process->start();
-                //Logger::info("Daemon is started, exit code = " . $process->getExitValue());
             }
         }
     }

develnext/src/ide/misc/GradleBuildConfig.php

@@ -160,15 +160,44 @@ public function doCompile($env, callable $log = null)
 
         if ($useByteCode && $this->isByteCodeEnabled()) {
             $scope = new Environment(null, Environment::HOT_RELOAD);
+            $scope->importClass(FileUtils::class);
 
             $jarLibraries = $this->externalJarLibraries;
 
             $generatedDirectory = $this->project->getSrcFile('', true);
+            $dirs = [$this->project->getSrcFile('')];
+
+            $includedFiles = [];
 
-            $scope->execute(function () use ($jarLibraries, $generatedDirectory) {
+            if ($bundle = BundleProjectBehaviour::get()) {
+                foreach ($bundle->fetchAllBundles($env) as $one) {
+                    $dirs[] = $one->getProjectVendorDirectory();
+                }
+            }
+
+            $scope->execute(function () use ($jarLibraries, $generatedDirectory, $dirs, &$includedFiles) {
                 ob_implicit_flush(true);
 
-                spl_autoload_register(function ($name) use ($jarLibraries, $generatedDirectory) {
+                spl_autoload_register(function ($name) use ($jarLibraries, $generatedDirectory, $dirs, &$includedFiles) {
+                    echo("Try class '$name' auto load");
+
+                    foreach ($dirs as $dir) {
+                        $filename = "$dir/$name.php";
+
+                        if (fs::exists($filename)) {
+                            echo "Find class '$name' in ", $filename, "\n";
+
+                            $compiled = new File($generatedDirectory, $name . ".phb");
+                            fs::ensureParent($compiled);
+
+                            $includedFiles[FileUtils::hashName($filename)] = true;
+
+                            $module = new Module($filename, false, true);
+                            $module->dump($compiled, true);
+                            return;
+                        }
+                    }
+
                     foreach ($jarLibraries as $file) {
                         if (!fs::exists($file)) {
                             echo "SKIP $file, is not exists.\n";
@@ -192,9 +221,7 @@ public function doCompile($env, callable $log = null)
 
                             $compiled = new File($generatedDirectory, $name . ".phb");
 
-                            if ($compiled->getParentFile() && !$compiled->getParentFile()->isDirectory()) {
-                                $compiled->getParentFile()->mkdirs();
-                            }
+                            fs::ensureParent($compiled);
 
                             $module->dump($compiled, true);
 
@@ -206,17 +233,13 @@ public function doCompile($env, callable $log = null)
                 });
             });
 
-            $dirs = [$this->project->getSrcFile('')];
-
-            if ($bundle = BundleProjectBehaviour::get()) {
-                foreach ($bundle->fetchAllBundles($env) as $one) {
-                    $dirs[] = $one->getProjectVendorDirectory();
-                }
-            }
-
             foreach ($dirs as $dir) {
-                fs::scan($dir, function ($filename) use ($log, $scope, $useByteCode, $generatedDirectory, $dir) {
+                fs::scan($dir, function ($filename) use ($log, $scope, $useByteCode, $generatedDirectory, $dir, &$includedFiles) {
                     if (str::endsWith($filename, '.php')) {
+                        if ($includedFiles[FileUtils::hashName($filename)]) {
+                            return;
+                        }
+
                         $filename = fs::normalize($filename);
 
                         if ($log) {
@@ -230,6 +253,7 @@ public function doCompile($env, callable $log = null)
                             $compiledFile->getParentFile()->mkdirs();
                         }
 
+                        $includedFiles[FileUtils::hashName($filename)] = true;
                         $scope->execute(function () use ($filename, $compiledFile) {
                             $module = new Module($filename, false, true);
                             $module->dump($compiledFile, true);
@@ -238,14 +262,19 @@ public function doCompile($env, callable $log = null)
                 });
             }
 
-            fs::scan($generatedDirectory, function ($filename) use ($log, $scope, $useByteCode) {
+            fs::scan($generatedDirectory, function ($filename) use ($log, $scope, $useByteCode, &$includedFiles) {
                 if (fs::ext($filename) == 'php') {
+                    if ($includedFiles[FileUtils::hashName($filename)]) {
+                        return;
+                    }
+
                     $filename = fs::normalize($filename);
 
                     if ($log) $log(":compile $filename");
 
                     $compiledFile = fs::pathNoExt($filename) . '.phb';
 
+                    $includedFiles[FileUtils::hashName($filename)] = true;
                     $scope->execute(function () use ($filename, $compiledFile) {
                         $module = new Module($filename, false, true);
                         $module->dump($compiledFile);