Skip to content

Commit 170f448

Browse files
committed
Line number should not be minus 1 for array index use.
1 parent bb942d6 commit 170f448

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

PHPCtags.class.php

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@ private function struct($node, $class_name = NULL, $function_name = NULL)
3131
} elseif ($node instanceof PHPParser_Node_Stmt_Class) {
3232
$kind = 'c';
3333
$name = $node->name;
34-
$line = $node->getLine() - 1;
34+
$line = $node->getLine();
3535
foreach ($node as $subNode) {
3636
$this->struct($subNode, $name);
3737
}
3838
} elseif ($node instanceof PHPParser_Node_Stmt_Property) {
3939
$kind = 'v';
4040
$prop = $node->props[0];
4141
$name = $prop->name;
42-
$line = $prop->getLine() - 1;
42+
$line = $prop->getLine();
4343
$scope = "class:" . $class_name;
4444
$access = $this->getAccess($node);
4545
} elseif ($node instanceof PHPParser_Node_Stmt_ClassConst) {
4646
$kind = 'd';
4747
$cons = $node->consts[0];
4848
$name = $cons->name;
49-
$line = $cons->getLine() - 1;
49+
$line = $cons->getLine();
5050
$scope = "class:" . $class_name;
5151
} elseif ($node instanceof PHPParser_Node_Stmt_ClassMethod) {
5252
$kind = 'f';
5353
$name = $node->name;
54-
$line = $node->getLine() - 1;
54+
$line = $node->getLine();
5555
$scope = "class:" . $class_name;
5656
$access = $this->getAccess($node);
5757
foreach ($node as $subNode) {
@@ -61,20 +61,20 @@ private function struct($node, $class_name = NULL, $function_name = NULL)
6161
$kind = 'd';
6262
$cons = $node->consts[0];
6363
$name = $cons->name;
64-
$line = $node->getLine() - 1;
64+
$line = $node->getLine();
6565
} elseif ($node instanceof PHPParser_Node_Stmt_Global) {
6666
$kind = 'v';
6767
$prop = $node->vars[0];
6868
$name = $prop->name;
69-
$line = $node->getLine() - 1;
69+
$line = $node->getLine();
7070
} elseif ($node instanceof PHPParser_Node_Stmt_Static) {
7171
//@todo
7272
} elseif ($node instanceof PHPParser_Node_Stmt_Declare) {
7373
//@todo
7474
} elseif ($node instanceof PHPParser_Node_Stmt_Function) {
7575
$kind = 'f';
7676
$name = $node->name;
77-
$line = $node->getLine() - 1;
77+
$line = $node->getLine();
7878
foreach ($node as $subNode) {
7979
$this->struct($subNode, $class_name, $name);
8080
}
@@ -83,7 +83,7 @@ private function struct($node, $class_name = NULL, $function_name = NULL)
8383
} elseif ($node instanceof PHPParser_Node_Stmt_Interface) {
8484
$kind = 'i';
8585
$name = $node->name;
86-
$line = $node->getLine() - 1;
86+
$line = $node->getLine();
8787
foreach ($node as $subNode) {
8888
$this->struct($subNode, $name);
8989
}
@@ -93,7 +93,7 @@ private function struct($node, $class_name = NULL, $function_name = NULL)
9393
$kind = 'v';
9494
$node = $node->var;
9595
$name = $node->name;
96-
$line = $node->getLine() - 1;
96+
$line = $node->getLine();
9797
if (!empty($class_name) && !empty($function_name)) {
9898
$scope = "function:" . $class_name . '::' . $function_name;
9999
} elseif (!empty($function_name)) {
@@ -105,7 +105,7 @@ private function struct($node, $class_name = NULL, $function_name = NULL)
105105
$kind = 'd';
106106
$node = $node->args[0]->value;
107107
$name = $node->value;
108-
$line = $node->getLine() - 1;
108+
$line = $node->getLine();
109109
break;
110110
}
111111
} else {
@@ -139,7 +139,7 @@ private function render($structs)
139139
$str .= $stuct['name'];
140140
}
141141
$str .= "\t" . $this->mFile;
142-
$str .= "\t" . "/^" . rtrim($lines[$stuct['line']], "\n") . "$/;\"";
142+
$str .= "\t" . "/^" . rtrim($lines[$stuct['line'] - 1], "\n") . "$/;\"";
143143
$str .= "\t" . $stuct['kind'];
144144
$str .= "\t" . "line:" . $stuct['line'];
145145
!empty($stuct['scope']) && $str .= "\t" . $stuct['scope'];

0 commit comments

Comments
 (0)