1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-11-10 00:42:40 +01:00

Fix some problems with the module linter that would cause various conflicting

warnings raised in __init__.php to overwrite eachother in uncomfortable ways.
This commit is contained in:
epriestley 2011-01-09 20:40:13 -08:00
parent 2c235bdf38
commit efb8219196
10 changed files with 104 additions and 34 deletions

View file

@ -68,7 +68,9 @@ abstract class ArcanistLintEngine {
}
public function getFilePathOnDisk($path) {
return $path;
return Filesystem::resolvePath(
$path,
$this->getWorkingCopy()->getProjectRoot());
}
public function setMinimumSeverity($severity) {
@ -145,12 +147,12 @@ abstract class ArcanistLintEngine {
}
foreach ($this->results as $path => $result) {
$result->setFilePathOnDisk($this->getFilePathOnDisk($path));
if (isset($this->fileData[$path])) {
// Only set the data if any linter loaded it. The goal here is to
// avoid binaries when we don't actually care about their contents,
// for performance.
$result->setData($this->fileData[$path]);
$result->setFilePathOnDisk($this->getFilePathOnDisk($path));
}
}

View file

@ -156,7 +156,12 @@ abstract class ArcanistLinter {
$path = $this->getActivePath();
$engine = $this->getEngine();
if ($offset === null) {
$line = null;
$char = null;
} else {
list($line, $char) = $engine->getLineAndCharFromOffset($path, $offset);
}
return $this->raiseLintAtLine(
$line + 1,

View file

@ -136,12 +136,18 @@ class ArcanistPhutilModuleLinter extends ArcanistLinter {
$bin = dirname($arc_root).'/scripts/phutil_analyzer.php';
$futures = array();
foreach ($modules as $key) {
foreach ($modules as $mkey => $key) {
$disk_path = $this->getModulePathOnDisk($key);
if (Filesystem::pathExists($disk_path)) {
$futures[$key] = new ExecFuture(
'%s %s',
$bin,
$disk_path);
} else {
// This can occur in git when you add a module in HEAD and then remove
// it in unstaged changes in the working copy. Just ignore it.
unset($modules[$mkey]);
}
}
$requirements = array();
@ -340,19 +346,26 @@ class ArcanistPhutilModuleLinter extends ArcanistLinter {
$need_functions,
$drop_modules);
$init_path = $this->getModulePathOnDisk($key).'/__init__.php';
$init_path = Filesystem::readablePath($init_path);
if (file_exists($init_path)) {
$try_path = Filesystem::readablePath($init_path);
if (Filesystem::pathExists($try_path)) {
$init_path = $try_path;
$old_file = Filesystem::readFile($init_path);
} else {
$old_file = '';
}
$this->willLintPath($init_path);
$message = $this->raiseLintAtOffset(
0,
null,
self::LINT_INIT_REBUILD,
"This regenerated phutil '__init__.php' file is suggested to ".
"address lint problems with static dependencies in the module.",
"This generated phutil '__init__.php' file is suggested to address ".
"lint problems with static dependencies in the module.",
$old_file,
$new_file);
$message->setDependentMessages($resolvable);
foreach ($resolvable as $message) {
$message->setObsolete(true);
}
$message->setGenerateFile(true);
}
}
@ -456,7 +469,9 @@ EOHEADER;
foreach ($places as $place) {
list($file, $offset) = explode(':', $place);
$this->willLintPath(
Filesystem::readablePath($this->getModulePathOnDisk($key).'/'.$file));
Filesystem::readablePath(
$this->getModulePathOnDisk($key).'/'.$file,
$this->getEngine()->getWorkingCopy()->getProjectRoot()));
return $this->raiseLintAtOffset(
$offset,
$code,

View file

@ -28,7 +28,9 @@ class ArcanistLintMessage {
protected $originalText;
protected $replacementText;
protected $appliedToDisk;
protected $generateFile;
protected $dependentMessages = array();
protected $obsolete;
public static function newFromDictionary(array $dict) {
$message = new ArcanistLintMessage();
@ -142,6 +144,24 @@ class ArcanistLintMessage {
return ($this->getLine() !== null);
}
public function setGenerateFile($generate_file) {
$this->generateFile = $generate_file;
return $this;
}
public function getGenerateFile() {
return $this->generateFile;
}
public function setObsolete($obsolete) {
$this->obsolete = $obsolete;
return $this;
}
public function getObsolete() {
return $this->obsolete;
}
public function isPatchable() {
return ($this->getReplacementText() !== null);
}

View file

@ -53,7 +53,10 @@ final class ArcanistLintPatcher {
// Copy existing file to preserve permissions. 'chmod --reference' is not
// supported under OSX.
if (Filesystem::pathExists($path)) {
// This path may not exist if we're generating a new file.
execx('cp -p %s %s', $path, $lint);
}
Filesystem::writeFile($lint, $data);
list($err) = exec_manual("mv -f %s %s", $lint, $path);

View file

@ -115,7 +115,8 @@ class ArcanistLintRenderer {
for (; $cursor < $line_num + $text_length; $cursor++) {
$chevron = ($cursor == $line_num);
$data = $line_data[$cursor - 1];
// We may not have any data if, e.g., the old file does not exist.
$data = idx($line_data, $cursor - 1, null);
// Highlight the problem substring.
$text_line = $text_lines[$cursor - $line_num];

View file

@ -9,6 +9,7 @@
phutil_require_module('arcanist', 'lint/severity');
phutil_require_module('phutil', 'console');
phutil_require_module('phutil', 'utils');
phutil_require_source('ArcanistLintRenderer.php');

View file

@ -22,6 +22,7 @@ final class ArcanistLintResult {
protected $data;
protected $filePathOnDisk;
protected $messages = array();
protected $effectiveMessages = array();
private $needsSort;
public function setPath($path) {
@ -41,9 +42,9 @@ final class ArcanistLintResult {
public function getMessages() {
if ($this->needsSort) {
$this->sortMessages();
$this->sortAndFilterMessages();
}
return $this->messages;
return $this->effectiveMessages;
}
public function setData($data) {
@ -73,18 +74,32 @@ final class ArcanistLintResult {
return false;
}
private function sortMessages() {
private function sortAndFilterMessages() {
$messages = $this->messages;
foreach ($messages as $key => $message) {
if ($message->getObsolete()) {
unset($messages[$key]);
continue;
}
if ($message->getGenerateFile()) {
$messages = array(
$key => $message,
);
break;
}
}
$map = array();
foreach ($messages as $key => $message) {
$map[$key] = ($message->getLine() * (2 << 12)) + $message->getChar();
}
asort($map);
$messages = array_select_keys($messages, array_keys($map));
$this->messages = $messages;
$this->effectiveMessages = $messages;
$this->needsSort = false;
return $this;
}
}

View file

@ -478,13 +478,18 @@ class ArcanistBaseWorkflow {
}
if (empty($this->changeCache[$path])) {
// TODO: This can legitimately occur under git if you make a change,
// "git commit" it, and then revert the change in the working copy and
// run "arc lint". We should probably just make a dummy, empty changeset
// in this case, at least under git.
if ($repository_api instanceof ArcanistGitAPI) {
// This can legitimately occur under git if you make a change, "git
// commit" it, and then revert the change in the working copy and run
// "arc lint".
$change = new ArcanistDiffChange();
$change->setCurrentPath($path);
return $change;
} else {
throw new Exception(
"Trying to get change for unchanged path '{$path}'!");
}
}
return $this->changeCache[$path];
}

View file

@ -168,6 +168,9 @@ EOTEXT
if ($prompt_patches) {
$old_file = $result->getFilePathOnDisk();
if (!Filesystem::pathExists($old_file)) {
$old_file = '/dev/null';
}
$new_file = new TempFile();
Filesystem::writeFile($new_file, $new);
@ -193,7 +196,7 @@ EOTEXT
"Amend HEAD with lint patches?",
$default_no = false);
if (!$amend) {
throw new ArcanistUsageException("Resolve lint changes and rediff.");
throw new ArcanistUsageException("Resolve lint changes and relint.");
}
execx(
'(cd %s; git commit -a --amend -C HEAD)',