Page MenuHomePhabricator
Files F13994131

D12141.id29189.diff
No OneTemporary
Actions

D12141.id29189.diff
View Options

diff --git a/src/applications/diffusion/controller/DiffusionBrowseSearchController.php b/src/applications/diffusion/controller/DiffusionBrowseSearchController.php
--- a/src/applications/diffusion/controller/DiffusionBrowseSearchController.php
+++ b/src/applications/diffusion/controller/DiffusionBrowseSearchController.php
@@ -88,7 +88,7 @@
$results = $pager->sliceResults($results);
if ($search_mode == 'grep') {
- $table = $this->renderGrepResults($results);
+ $table = $this->renderGrepResults($results, $query_string);
$header = pht(
'File content matching "%s" under "%s"',
$query_string,
@@ -112,28 +112,10 @@
return array($box, $pager_box);
}
- private function renderGrepResults(array $results) {
+ private function renderGrepResults(array $results, $pattern) {
$drequest = $this->getDiffusionRequest();
- require_celerity_resource('syntax-highlighting-css');
-
- // NOTE: This can be wrong because we may find the string inside the
- // comment. But it's correct in most cases and highlighting the whole file
- // would be too expensive.
- $futures = array();
- $engine = PhabricatorSyntaxHighlighter::newEngine();
- foreach ($results as $result) {
- list($path, $line, $string) = $result;
- $futures["{$path}:{$line}"] = $engine->getHighlightFuture(
- $engine->getLanguageFromFilename($path),
- ltrim($string));
- }
-
- try {
- id(new FutureIterator($futures))
- ->limit(8)
- ->resolveAll();
- } catch (PhutilSyntaxHighlighterException $ex) {}
+ require_celerity_resource('phabricator-search-results-css');
$rows = array();
foreach ($results as $result) {
@@ -145,14 +127,57 @@
'line' => $line,
));
- try {
- $string = $futures["{$path}:{$line}"]->resolve();
- } catch (PhutilSyntaxHighlighterException $ex) {}
+ $matches = null;
+ $count = @preg_match_all(
+ '('.$pattern.')u',
+ $string,
+ $matches,
+ PREG_OFFSET_CAPTURE);
+
+ if (!$count) {
+ $output = ltrim($string);
+ } else {
+ $output = array();
+ $cursor = 0;
+ $length = strlen($string);
+ foreach ($matches[0] as $match) {
+ $offset = $match[1];
+ if ($cursor != $offset) {
+ $output[] = array(
+ 'text' => substr($string, $cursor, $offset),
+ 'highlight' => false,
+ );
+ }
+ $output[] = array(
+ 'text' => $match[0],
+ 'highlight' => true,
+ );
+ $cursor = $offset + strlen($match[0]);
+ }
+ if ($cursor != $length) {
+ $output[] = array(
+ 'text' => substr($string, $cursor),
+ 'highlight' => false,
+ );
+ }
+
+ if ($output) {
+ $output[0]['text'] = ltrim($output[0]['text']);
+ }
+
+ foreach ($output as $key => $segment) {
+ if ($segment['highlight']) {
+ $output[$key] = phutil_tag('strong', array(), $segment['text']);
+ } else {
+ $output[$key] = $segment['text'];
+ }
+ }
+ }
$string = phutil_tag(
'pre',
- array('class' => 'PhabricatorMonospaced'),
- $string);
+ array('class' => 'PhabricatorMonospaced phui-source-fragment'),
+ $output);
$path = Filesystem::readablePath($path, $drequest->getPath());
diff --git a/webroot/rsrc/css/application/search/search-results.css b/webroot/rsrc/css/application/search/search-results.css
--- a/webroot/rsrc/css/application/search/search-results.css
+++ b/webroot/rsrc/css/application/search/search-results.css
@@ -8,3 +8,13 @@
padding: 0 4px;
border-radius: 3px;
}
+
+.phui-source-fragment {
+ color: {$darkgreytext};
+}
+
+.phui-source-fragment strong {
+ background-color: {$lightyellow};
+ font-weight: normal;
+ color: #000000;
+}

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 24, 4:03 AM (3 w, 6 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6721644
Default Alt Text
D12141.id29189.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility