Prevent duplicate/overwritten keys
This commit is contained in:
parent
54b00f5925
commit
46bf135446
@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
namespace NoccyLabs\JsonEdit\Editor;
|
namespace NoccyLabs\JsonEdit\Editor;
|
||||||
|
|
||||||
|
use Exception;
|
||||||
use NoccyLabs\JsonEdit\List\TreeList;
|
use NoccyLabs\JsonEdit\List\TreeList;
|
||||||
use NoccyLabs\JsonEdit\Settings;
|
use NoccyLabs\JsonEdit\Settings;
|
||||||
use NoccyLabs\JsonEdit\Terminal\Terminal;
|
use NoccyLabs\JsonEdit\Terminal\Terminal;
|
||||||
@ -590,10 +591,14 @@ class Editor
|
|||||||
if ($parent->node instanceof ObjectNode) {
|
if ($parent->node instanceof ObjectNode) {
|
||||||
$newVal = $this->ask("\e[0;33mnew key:\e[0m ", $entry->key);
|
$newVal = $this->ask("\e[0;33mnew key:\e[0m ", $entry->key);
|
||||||
if (!empty($newVal)) {
|
if (!empty($newVal)) {
|
||||||
|
try {
|
||||||
$parent->node->rename($entry->key, $newVal);
|
$parent->node->rename($entry->key, $newVal);
|
||||||
$entry->key = $newVal;
|
$entry->key = $newVal;
|
||||||
$this->list->parseTree();
|
|
||||||
$this->redrawEditor();
|
$this->redrawEditor();
|
||||||
|
} catch (Exception $e) {
|
||||||
|
$this->redrawEditor();
|
||||||
|
$this->showMessage("\e[97;41m".$e->getMessage());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// $this->term->setCursor(1, $h);
|
// $this->term->setCursor(1, $h);
|
||||||
@ -679,6 +684,10 @@ class Editor
|
|||||||
$this->redrawInfoBar();
|
$this->redrawInfoBar();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if ($node->hasKey($key)) {
|
||||||
|
$this->showMessage("\e[97;41mThe key {$key} already exists");
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($value === null)
|
if ($value === null)
|
||||||
|
@ -131,19 +131,6 @@ class TreeList implements Countable, IteratorAggregate
|
|||||||
$path = dirname($path);
|
$path = dirname($path);
|
||||||
}
|
}
|
||||||
|
|
||||||
// $depth = $this->getEntryForIndex($index)->depth;
|
|
||||||
// if ($ignoreSelf) $depth = max(0, $depth - 1);
|
|
||||||
// echo "{start={$depth}}"; sleep(1);
|
|
||||||
// while ($index >= 0) {
|
|
||||||
// $entry = $this->getEntryForIndex($index);
|
|
||||||
// if ($entry->depth < $depth) {
|
|
||||||
// $node = $entry->node;
|
|
||||||
// if ($node instanceof ArrayNode || $node instanceof ObjectNode) {
|
|
||||||
// return $index;
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// $index--;
|
|
||||||
// }
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15,8 +15,16 @@ class ObjectNode extends Node implements CollapsibleNode
|
|||||||
$this->properties[$key] = $value;
|
$this->properties[$key] = $value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function hasKey(string $key): bool
|
||||||
|
{
|
||||||
|
return array_key_exists($key, $this->properties);
|
||||||
|
}
|
||||||
|
|
||||||
public function rename(string $key, string $newKey)
|
public function rename(string $key, string $newKey)
|
||||||
{
|
{
|
||||||
|
if (array_key_exists($newKey, $this->properties)) {
|
||||||
|
throw new \Exception("Key {$newKey} already exists");
|
||||||
|
}
|
||||||
$renamed = [];
|
$renamed = [];
|
||||||
foreach ($this->properties as $k=>$v) {
|
foreach ($this->properties as $k=>$v) {
|
||||||
$renamed[($k==$key)?$newKey:$k] = $v;
|
$renamed[($k==$key)?$newKey:$k] = $v;
|
||||||
|
Loading…
Reference in New Issue
Block a user