Edgewall Software
Modify

Ticket #3326 (closed enhancement: fixed)

Opened 6 years ago

Last modified 6 years ago

Improvements to PHP highlighter

Reported by: Tim Hatch <trac@…> Owned by: cboos
Priority: normal Milestone: 0.10
Component: general Version: devel
Severity: minor Keywords:
Cc:
Release Notes:
API Changes:

Description

Two minor issues with the PHP highlighter (source:trunk/trac/mimeview/php.py):

  1. The output of php -sn includes _two_ junk lines at the bottom, although the second one doesn't include the trailing \n. The last line is a </code> that definitely should be stripped. That second-to-last line is a </span> which was messing up validation but apparently not caught because it didn't cause any weirdness.
  2. php -sn has this nasty tendency to close tags on the line past where it'd seem logical to close them. This causes a lot of unnecessary html code, and in the interest of sending less data over the wire, this can easily be worked around. I've modified the PHPDeuglifier to scooch the close tags up to where they belong. I'm sad to see this gotcha leave, as it's what let me find #3262.

I've tested both of these points for consistency against PHP 4.3.10-16 on Debian, 4.4.1 on Windows, and 5.1.4-p10 on Gentoo.

Attaching a patch in a sec.

Attachments

mimeview-php-spans.diff (1.8 KB) - added by Tim Hatch <trac@…> 6 years ago.
Diff against trunk@3483
mimeview-php-spans.2.diff (1.7 KB) - added by Tim Hatch <trac@…> 6 years ago.
Diff against trunk@3486, fixed line endings

Download all attachments as: .zip

Change History

Changed 6 years ago by Tim Hatch <trac@…>

Diff against trunk@3483

Changed 6 years ago by Tim Hatch <trac@…>

Diff against trunk@3486, fixed line endings

comment:1 Changed 6 years ago by cboos

  • Milestone set to 0.10
  • Owner changed from jonas to cboos
  • Status changed from new to assigned

Patch looks fine.

comment:2 Changed 6 years ago by cboos

  • Resolution set to fixed
  • Status changed from assigned to closed

Applied in r3488, thanks!

View

Add a comment

Modify Ticket

Change Properties
<Author field>
Action
as closed
The resolution will be deleted. Next status will be 'reopened'
to The owner will be changed from cboos. Next status will be 'closed'
Author


E-mail address and user name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.