Detailed parsing and styling of HTTP request and status lines.

naveed-ahmad · May 10, 2012 · b2ccd4c · b2ccd4c
1 parent 140172d
commit b2ccd4c
Show file tree

Hide file tree

Showing 20 changed files with 69 additions and 30 deletions.
diff --git a/classref.txt b/classref.txt
@@ -209,9 +209,11 @@ VBScript ("vbscript"):
 
 HTTP ("http"):
 
-  title            first line of a request or a response
+  request          first line of a request
+  status           first line of a response
   attribute        header name
-  string           header value
+  string           header value or query string in a request line
+  number           status code
 
 Lua ("lua"):
 

diff --git a/src/languages/http.js b/src/languages/http.js
@@ -9,12 +9,20 @@ hljs.LANGUAGES.http = {
     illegal: '\\S',
     contains: [
       {
-        className: 'title',
+        className: 'status',
         begin: '^HTTP/[0-9\\.]+', end: '$',
+        contains: [{className: 'number', begin: '\\b\\d{3}\\b'}]
       },
       {
-        className: 'title',
-        begin: '^[A-Z]+ .*?HTTP/[0-9\\.]+$',
+        className: 'request',
+        begin: '^[A-Z]+ (.*?) HTTP/[0-9\\.]+$', returnBegin: true, end: '$',
+        contains: [
+          {
+            className: 'string',
+            begin: ' ', end: ' ',
+            excludeBegin: true, excludeEnd: true
+          }
+        ]
       },
       {
         className: 'attribute',

diff --git a/src/styles/arta.css b/src/styles/arta.css
@@ -81,7 +81,9 @@ pre .css .pseudo,
 pre .css .attr_selector,
 pre .lisp .title,
 pre .winutils,
-pre .tex .command
+pre .tex .command,
+pre .request,
+pre .status
 {
   color: #6644aa;
 }

diff --git a/src/styles/ascetic.css b/src/styles/ascetic.css
@@ -41,6 +41,8 @@ pre .flow,
 pre .lisp .title,
 pre .apache .tag,
 pre .tex .command,
-pre .http .title {
+pre .http .title,
+pre .request,
+pre .status {
   font-weight: bold;
 }
diff --git a/src/styles/brown_paper.css b/src/styles/brown_paper.css
@@ -15,7 +15,9 @@ pre .change,
 pre .winutils,
 pre .flow,
 pre .lisp .title,
-pre .tex .special {
+pre .tex .special,
+pre .request,
+pre .status {
   color:#005599;
   font-weight:bold;
 }

diff --git a/src/styles/dark.css b/src/styles/dark.css
@@ -87,7 +87,9 @@ pre .chunk,
 pre .winutils,
 pre .bash .variable,
 pre .apache .tag,
-pre .tex .special {
+pre .tex .special,
+pre .request,
+pre .status {
   font-weight: bold;
 }
 

diff --git a/src/styles/default.css b/src/styles/default.css
@@ -108,7 +108,9 @@ pre .bash .variable,
 pre .apache .tag,
 pre .go .typename,
 pre .tex .command,
-pre .markdown .strong {
+pre .markdown .strong,
+pre .request,
+pre .status {
   font-weight: bold;
 }
 

diff --git a/src/styles/far.css b/src/styles/far.css
@@ -103,6 +103,8 @@ pre .flow,
 pre .apache .tag,
 pre .nginx .built_in,
 pre .tex .command,
-pre .tex .special {
+pre .tex .special,
+pre .request,
+pre .status {
   font-weight: bold;
 }
diff --git a/src/styles/github.css b/src/styles/github.css
@@ -23,7 +23,9 @@ pre .css .rule .keyword,
 pre .winutils,
 pre .javascript .title,
 pre .lisp .title,
-pre .subst {
+pre .subst,
+pre .request,
+pre .status {
   color: #000;
   font-weight: bold
 }

diff --git a/src/styles/googlecode.css b/src/styles/googlecode.css
@@ -17,16 +17,15 @@ pre .comment * {
 }
 
 pre .keyword,
-pre .ruby .function .keyword,
-pre .function .keyword,
-pre .sub .keyword,
 pre .method,
 pre .list .title,
 pre .tag .title,
 pre .setting .value,
 pre .winutils,
 pre .tex .command,
-pre .http .title {
+pre .http .title,
+pre .request,
+pre .status {
   color: #008;
 }
 

diff --git a/src/styles/idea.css b/src/styles/idea.css
@@ -53,7 +53,9 @@ pre .css .function,
 pre .ini .title,
 pre .css .class,
 pre .list .title,
-pre .tex .command {
+pre .tex .command,
+pre .request,
+pre .status {
   font-weight: bold;
   color: #000080;
 }

diff --git a/src/styles/ir_black.css b/src/styles/ir_black.css
@@ -16,7 +16,9 @@ pre .javadoc {
 
 pre .keyword,
 pre .tag,
-pre .tex .command {
+pre .tex .command,
+pre .request,
+pre .status {
   color: #96CBFE;
 }
 

diff --git a/src/styles/magula.css b/src/styles/magula.css
@@ -93,7 +93,9 @@ pre .winutils,
 pre .bash .variable,
 pre .apache .tag,
 pre .xml .tag,
-pre .tex .command {
+pre .tex .command,
+pre .request,
+pre .status {
   font-weight: bold;
   color: navy;
 }

diff --git a/src/styles/monokai.css b/src/styles/monokai.css
@@ -100,7 +100,9 @@ pre .chunk,
 pre .winutils,
 pre .bash .variable,
 pre .apache .tag,
-pre .tex .special {
+pre .tex .special,
+pre .request,
+pre .status {
   font-weight: bold;
 }
 

diff --git a/src/styles/school_book.css b/src/styles/school_book.css
@@ -95,7 +95,9 @@ pre .chunk,
 pre .winutils,
 pre .bash .variable,
 pre .apache .tag,
-pre .tex .command {
+pre .tex .command,
+pre .request,
+pre .status {
   font-weight: bold;
 }
 

diff --git a/src/styles/solarized_dark.css b/src/styles/solarized_dark.css
@@ -21,11 +21,12 @@ pre .javadoc {
 }
 
 pre .keyword,
-pre .css .rule .keyword,
 pre .winutils,
 pre .method,
 pre .addition,
-pre .css .tag {
+pre .css .tag,
+pre .request,
+pre .status {
   color: #859900;
 }
 

diff --git a/src/styles/solarized_light.css b/src/styles/solarized_light.css
@@ -21,11 +21,12 @@ pre .javadoc {
 }
 
 pre .keyword,
-pre .css .rule .keyword,
 pre .winutils,
 pre .method,
 pre .addition,
-pre .css .tag {
+pre .css .tag,
+pre .request,
+pre .status {
   color: #859900;
 }
 

diff --git a/src/styles/sunburst.css b/src/styles/sunburst.css
@@ -17,7 +17,9 @@ pre .javadoc {
 }
 
 pre .keyword,
-pre .ruby .function .keyword {
+pre .ruby .function .keyword,
+pre .request,
+pre .status {
   color: #E28964;
 }
 

diff --git a/src/styles/vs.css b/src/styles/vs.css
@@ -22,7 +22,9 @@ pre .built_in,
 pre .smalltalk .class,
 pre .winutils,
 pre .bash .variable,
-pre .tex .command {
+pre .tex .command,
+pre .request,
+pre .status {
   color: rgb(0, 0, 255);
 }
 

diff --git a/src/styles/zenburn.css b/src/styles/zenburn.css
@@ -13,11 +13,11 @@ pre code {
 
 pre .keyword,
 pre .tag,
-pre .django .tag,
-pre .django .keyword,
 pre .css .class,
 pre .css .id,
-pre .lisp .title {
+pre .lisp .title,
+pre .request,
+pre .status {
   color: #E3CEAB;
 }