Merge c886d7a into 0c737ef

streetsidesoftware · Aug 12, 2020 · 734214c · 734214c
2 parents 0c737ef + c886d7a
commit 734214c
Show file tree

Hide file tree

Showing 5 changed files with 147 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -1,14 +1,36 @@
-name: "build-test"
-on: # rebuild any PRs and main branch changes
+name: Test
+on:
   pull_request:
   push:
+    branches:
+      - master
 
 jobs:
-  test: # make sure build/ci work properly
-    runs-on: ubuntu-latest
+  test:
+
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        node-version:
+          - 10.x
+          - 12.x
+          - 14.x
+
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+
     steps:
     - uses: actions/checkout@v2
-    - run: |
-        node -v
-        npm install
-        npm test
+
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - run: npm ci
+    - run: npm test
+    - run: node ./bin.js trace test
+    - run: node ./bin.js "**/{*.ts,*.md}"
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -21,7 +21,7 @@ pool:
 steps:
 - task: NodeTool@0
   inputs:
-    versionSpec: '10.x'
+    versionSpec: '12.x'
   displayName: 'Install Node.js'
 
 - script: |

diff --git a/packages/cspell-lib/dictionaries/miscTerms.txt b/packages/cspell-lib/dictionaries/miscTerms.txt
@@ -3,6 +3,7 @@ acos
 addon
 addons
 Addr
+AES128
 antialias
 api
 apis
@@ -75,6 +76,7 @@ dtor
 dtors
 ebook
 ebooks
+ECDHE
 ECMA
 else
 elseif
@@ -88,6 +90,7 @@ EOLs
 errorcodes
 errorlog
 eslint
+ESMTPS
 expect
 expr
 exprs
@@ -104,6 +107,7 @@ fixedpoint
 frac
 framerate
 fsharp
+GCM
 GDPR
 git
 git-commit
@@ -175,13 +179,17 @@ log
 login
 logout
 lua
+mailfrom
+mailto
 makefile
 mapfn
 markdown
 maxptime
 mdn
 memoize
 MERCHANTABLITY
+mimetype
+minepart
 mocha
 msdn
 mtime
@@ -263,6 +271,7 @@ rethrowable
 rethrowables
 rethrows
 RHS
+RSA
 ruby
 run
 runnable
@@ -273,12 +282,14 @@ scss
 sematic
 server
 serverless
+SHA256
 shaderlab
 sharedmemory
 shellscript
 sin
 sinon
 sizeof
+smtp
 sourcefile
 sql
 sqrt

diff --git a/packages/cspell-lib/samples/src/email.mail b/packages/cspell-lib/samples/src/email.mail
@@ -0,0 +1,100 @@
+Delivered-To: info@streetsidesoftware.nl
+Received: by 2002:ac8:346c:0:0:0:0:0 with SMTP id v41csp2183359qtb;
+        Thu, 12 Sep 2019 07:13:41 -0700 (PDT)
+X-Google-Smtp-Source: APXvYqzd8SOB6ne2u56s52epl6K4yY1DdmedtzJ+6JwygWcvlP7438XzgXUqYG+lUaPUzMq8dD7sExTLB
+X-Received: by 2002:ac8:46d9:: with SMTP id h25mr13140674qto.57.1568297621161;
+        Thu, 12 Sep 2019 07:13:41 -0700 (PDT)
+ARC-Seal: i=1; a=rsa-sha256; t=1568297621; cv=none;
+        d=google.com; s=arc-20160816;
+        b=cjcHZJCrsO9am9x00QEBoBrCa7qQNZ3d0/MNroPm81pzLhdCO7xb6AUN0zcCaSBNFN
+         Y4e3j50YejrorMnbcQIzSAoTdE0dKnhJGYH1819srgl1UQ4CqUI1N++L3JgJiVAQS+dL
+         Gm9Mo4bjh7K+SAlK5UaG+/NjMNI7ZTxwuru90PG2Pgss9D4sb5/wVXyWCFQbYeyJ4BTJ
+         Yy10GcIvrpxyS/Wr+buQQ6lIT10wLhrmEB6H31qp09uqHaCmPSZipbNL4lLjmaLFyBpD
+         PTyAoixjIZFHaBG7i2YnPu8/8hDAudPjkcBH+SwQMXXIxGPyluRYWnCBpI6WjImyeOk7
+         H6Ng==
+ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816;
+        h=list-unsubscribe:list-post:list-archive:list-id:precedence
+         :content-transfer-encoding:mime-version:subject:message-id:cc:to
+         :reply-to:from:date;
+        bh=4Ro0El8wyicaEvvJjoGWpo3JB0heo2oeUyIfWD6Ugxc=;
+        b=B0CY0b1coF1UkqVas/Jnr+SfiG11zT5cudYft6rNsh1R+YB1RpDfIOd3y8bddQX6DD
+         UJ4S5AyEi/3hb943NkZobQuqIKxjkvuAOiXLVdIjTsBv5AgG6NvBXaz6wlI580yED71K
+         tn0yLB6vil0uuzQxWOtdCXz/4RmtclciloTJ01nGxTrGUYKA7DfJiVjaNUzvn3cfLLiu
+         AidwktEgziiqOBN2RQL2+SC8l4kZ52erudCR8wedGXnkfywxBMUhaU7jI3YhVP2no4kg
+         zuMbTIfTGfYwu6D4OS0NEcgZyg301WbfhZch1cu0tXElvps4z4thjwABCvvNDziVvakX
+         l9Ow==
+ARC-Authentication-Results: i=1; mx.google.com;
+       spf=pass (google.com: domain of noreply@github.com designates 192.30.252.203 as permitted sender) smtp.mailfrom=noreply@github.com;
+       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=github.com
+Return-Path: <noreply@github.com>
+Received: from out-20.smtp.github.com (out-20.smtp.github.com. [192.30.252.203])
+        by mx.google.com with ESMTPS id q12si17898597qkm.305.2019.09.12.07.13.41
+        for <info@streetsidesoftware.nl>
+        (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);
+        Thu, 12 Sep 2019 07:13:41 -0700 (PDT)
+Received-SPF: pass (google.com: domain of noreply@github.com designates 192.30.252.203 as permitted sender) client-ip=192.30.252.203;
+Authentication-Results: mx.google.com;
+       spf=pass (google.com: domain of noreply@github.com designates 192.30.252.203 as permitted sender) smtp.mailfrom=noreply@github.com;
+       dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=github.com
+Received: from github-lowworker-19d82f6.ac4-iad.github.net (github-lowworker-19d82f6.ac4-iad.github.net [10.52.16.75]) by smtp.github.com (Postfix) with ESMTP id B78C18C04F6 for <info@streetsidesoftware.nl>; Thu, 12 Sep 2019 07:13:40 -0700 (PDT)
+Date: Thu, 12 Sep 2019 07:13:40 -0700
+From: Nigel Scott <notifications@github.com>
+Reply-To: "streetsidesoftware/vscode-spell-checker" <reply+AA4RD2J4GJ2OKZXTC6SLPW53Q6JSJEVBNHHB2YAJ4E@reply.github.com>
+To: "streetsidesoftware/vscode-spell-checker" <vscode-spell-checker@noreply.github.com>
+Cc: Subscribed <subscribed@noreply.github.com>
+Message-ID: <streetsidesoftware/vscode-spell-checker/issues/381@github.com>
+Subject: [streetsidesoftware/vscode-spell-checker] Ignore paths do not work with folders (#381)
+Mime-Version: 1.0
+Content-Type: multipart/alternative; boundary="--==_mimepart_5d7a5294a89c3_4cab3ff1e4ecd9648489e"; charset=UTF-8
+Content-Transfer-Encoding: 7bit
+Precedence: list
+X-GitHub-Sender: Gruntfuggly
+X-GitHub-Recipient: Info3S
+X-GitHub-Reason: subscribed
+List-ID: streetsidesoftware/vscode-spell-checker <vscode-spell-checker.streetsidesoftware.github.com>
+List-Archive: https://github.com/streetsidesoftware/vscode-spell-checker
+List-Post: <mailto:reply+AA4RD2J4GDFDFJ2OKZXTC6SLPW53Q6JSJEVBNHHB2YAJ4E@reply.github.com>
+List-Unsubscribe: <mailto:unsub+AA4RD2J4GJ2OKJDHZXTC6SLPW53Q6JSJEVBNHHB2YAJ4E@reply.github.com>, <https://github.com/notifications/unsubscribe/AA4RD2MZAUNFKS7SBSNZSLDQJJFBJHGFJANCNFSM4IWFCFDA>
+X-Auto-Response-Suppress: All
+X-GitHub-Recipient-Address: info@streetsidesoftware.nl
+
+----==_mimepart_5d7a5294a89c3_4cab3ff1e4ecd9648489e
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+If I specify a filename in the ignorePaths it gets ignored. However, if I add any sort of path to the filename it is no longer ignored.
+
+I have tried using '**' and '*' and the explicit path and none of them seem to work.
+
+
+--
+You are receiving this because you are subscribed to this thread.
+Reply to this email directly or view it on GitHub:
+https://github.com/streetsidesoftware/vscode-spell-checker/issues/381
+----==_mimepart_5d7a5294a89c3_4cab3ff1e4ecd9648489e
+Content-Type: text/html; charset=UTF-8
+Content-Transfer-Encoding: 7bit
+
+<p>If I specify a filename in the ignorePaths it gets ignored. However, if I add any sort of path to the filename it is no longer ignored.</p>
+<p>I have tried using '**' and '*' and the explicit path and none of them seem to work.</p>
+
+<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">&mdash;<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/streetsidesoftware/vscode-spell-checker/issues/381?email_source=notifications&amp;email_token=AA4RD2IEPDPMT4F5YKNFBELQJJFBJA5CNFSM4IWFCFDKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HLABHQQ">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/AA4RD2J6PL5AZZCMQSWWWGDQJJFBJANCNFSM4IWFCFDA">mute the thread</a>.<img src="https://github.com/notifications/beacon/AA4RD2L6JO4NBHKYLQC7GLTQJJFBJA5CNFSM4IWFCFDKYY3PNVWWK3TUL52HS4DFUVEXG43VMWVGG33NNVSW45C7NFSM4HLABHQQ.gif" height="1" width="1" alt="" /></p>
+<script type="application/ld+json">[
+{
+"@context": "http://schema.org",
+"@type": "EmailMessage",
+"potentialAction": {
+"@type": "ViewAction",
+"target": "https://github.com/streetsidesoftware/vscode-spell-checker/issues/381?email_source=notifications\u0026email_token=AA4RD2IEPDPMT4F5FFURFYKNFBELQJJFBJA5CNFSM4IWFCFDKYY3PNVWWK3TUL52HS4DFUG43VMWVGG33NNVSW45C7NFSM4HLABH",
+"url": "https://github.com/streetsidesoftware/vscode-spell-checker/issues/381?email_source=notifications\u0026email_token=AA4RD2IEPDPMT4F5YKJEGSKNFBELQJJFBJAFSM4IWFCFDKYY3PNVWWK3TUL52HS4DFVEXG43VMWVGG33NNVSW45C7NFSM4HLABH",
+"name": "View Issue"
+},
+"description": "View this Issue on GitHub",
+"publisher": {
+"@type": "Organization",
+"name": "GitHub",
+"url": "https://github.com"
+}
+}
+]</script>
+----==_mimepart_5d7a5294a89c3_4cab3ff1e4ecd9648489e--
diff --git a/packages/cspell-lib/src/Settings/RegExpPatterns.ts b/packages/cspell-lib/src/Settings/RegExpPatterns.ts
@@ -6,14 +6,17 @@ export const regExHexDigits = /^x?[0-1a-f]+$/i;
 export const regExMatchCommonHexFormats = /(?:#[0-9a-f]{3,8})|(?:0x[0-9a-f]+)|(?:\\u[0-9a-f]{4})|(?:\\x\{[0-9a-f]{4}\})/gi;
 // tslint:disable-next-line
 export const regExSpellingGuard = /(?:(?:spell-?checker|cSpell)::?\s*disable(?!-line|-next)\b[\s\S]*?(?:(?:spell-?checker|cSpell)::?\s*enable\b|$))|(?:.*(?:spell-?checker|cSpell)::?\s*disable-line\b.*)|(?:(?:spell-?checker|cSpell)::?\s*disable-next\b.*\r?\n.*\r?\n)/gi;
+export const regExSpellingGuardBlock = /(\bc?spell(?:-?checker)?::?)\s*disable(?!-line|-next)\b[\s\S]*?((?:\1\s*enable\b)|$)/gi;
+export const regExSpellingGuardNext = /\bc?spell(?:-?checker)?::?\s*disable-next\b.*\s.*/gi;
+export const regExSpellingGuardLine = /^.*\bc?spell(?:-?checker)?::?\s*disable-line\b.*/gim;
 export const regExPublicKey = /BEGIN\s+((?:RSA\s+)?PUBLIC)\s+KEY(?:[\w=+\-\/]*\r?\n)+?-*END\s+\1/g;
 export const regExCert = /BEGIN\s+(CERTIFICATE|RSA\s+(?:PRIVATE|PUBLIC)\s+KEY)(?:[\w=+\-\/]*\r?\n)+?-*END\s+\1/g;
 export const regExEscapeCharacters = /\\(?:[anrvtbf]|[xu][a-f0-9]+)/gi;
-export const regExBase64 = /(?:[a-z0-9\/+]{40,}\s*)+(?:[a-z0-9\/+]+=*)?/gi;
+export const regExBase64 = /(?:[a-z0-9\/+]{40,})(?:\s^\s*[a-z0-9\/+]{40,})*(?:\s^\s*[a-z0-9\/+]+=*)?/gim;
 
 // Include Expressions
 export const regExPhpHereDoc = /<<<['"]?(\w+)['"]?[\s\S]+?^\1;/gm;
-export const regExString = /(?:(['"])(?:\\\\|(?:\\\1)|[^\1\n])*?\1)|(?:([`])(?:\\\\|(?:\\\2)|[^\2])+?\2)/g;
+export const regExString = /(?:(['"]).*?(?<![^\\]\\(\\\\)*)\1)|(?:`[\s\S]*?(?<![^\\]\\(\\\\)*)`)/g;
 
 // Note: the C Style Comments incorrectly considers '/*' and '//' inside of strings as comments.
 export const regExCStyleComments = /(?:\/\/.*)|(?:\/\*[\s\S]+?\*\/)/g;