diff --git a/core/Parsers.fs b/core/Parsers.fs
index 79e6d25..5a3fa3a 100644
--- a/core/Parsers.fs
+++ b/core/Parsers.fs
@@ -35,6 +35,19 @@ let dartdoc : ContentParser -> ContentParser =
 
 let dartdoc_markdown ctx = dartdoc markdown_noHeader ctx
 
+/// ESLint configuration comments parser that prevents wrapping of eslint-disable lines
+/// https://github.com/dnut/Rewrap/issues/33
+let eslintConfigComments : ContentParser -> ContentParser =
+  fun content ctx ->
+
+  let rx = regex @"^\s*//\s*eslint-(disable-next-line|disable-line)"
+
+  fun line ->
+    if isMatch rx line then
+      finished_ line noWrapBlock
+    else
+      content ctx line
+
 let ignoreAll ctx = Parsing_Internal.ignoreAll ctx
 
 let godoc : ContentParser = fun _ctx ->
diff --git a/core/Parsing.Documents.fs b/core/Parsing.Documents.fs
index 6380590..76ab80b 100644
--- a/core/Parsing.Documents.fs
+++ b/core/Parsing.Documents.fs
@@ -46,6 +46,9 @@ let private configFile = sc [line "#"]
 let java : DocumentProcessor =
   sc [ jsDocBlock; cBlock; line' "//[/!]" jsdoc_markdown; line "//" ]
 
+let javascript : DocumentProcessor =
+  sc [ jsDocBlock; cBlock; line' "//[/!]" (eslintConfigComments jsdoc_markdown); line "//" ]
+
 // Takes 4 args to create a Language:
 //  1. display name (used only in VS)
 //  2. string of aliases (language IDs used by the client. Not needed if they only differ
@@ -129,7 +132,7 @@ let mutable languages = [
     lang "INI" "" ".ini" <| sc [line "[#;]"]
     lang "J" "" ".ijs" <| sc [line @"NB\."]
     lang "Java" "" ".java" java
-    lang "JavaScript" "javascriptreact|js" ".js|.jsx" java
+    lang "JavaScript" "javascriptreact|js" ".js|.jsx" javascript
     lang "Julia" "" ".jl" <| sc [block ("#=", "=#"); line "#"; block (@".*?""""""", "\"\"\"")]
     lang "JSON" "json5|jsonc" ".json|.json5|.jsonc" java
     lang "LaTeX" "tex" ".bbx|.cbx|.cls|.sty|.tex"
@@ -182,7 +185,7 @@ let mutable languages = [
     lang "Tcl" "" ".tcl" <| configFile
     lang "Textile" "" ".textile" <| docOf markdown
     lang "TOML" "" ".toml" <| configFile
-    lang "TypeScript" "typescriptreact" ".ts|.tsx" java
+    lang "TypeScript" "typescriptreact" ".ts|.tsx" javascript
     lang "Verilog/SystemVerilog" "systemverilog|verilog" ".sv|.svh|.v|.vh|.vl" java
     lang "XAML" "" ".xaml"
         html