Merge remote-tracking branch 'upstream/master'

Author: aminya

.github/workflows/ci.yml

@@ -0,0 +1,51 @@
+name: ci
+on:
+  - pull_request
+  - push
+
+jobs:
+  Test:
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+          - windows-latest
+        atom_channel:
+          - stable
+          - nightly
+    steps:
+      - uses: actions/checkout@v2
+      - name: Cache
+        uses: actions/cache@v2
+        with:
+          path: |
+            'node_modules'
+            'C:/Program Files (x86)/MSBuild/Microsoft.Cpp/v4.0/v140'
+          key: ${{ runner.os }}-${{ matrix.atom_channel }}-${{ hashFiles('package.json') }}
+
+      - uses: UziTech/action-setup-atom@v1
+        with:
+          channel: ${{ matrix.atom_channel }}
+
+      - name: Install Visual Studio 2015 on Windows
+        if: ${{ contains(matrix.os, 'windows') }}
+        run: |
+          choco install visualcpp-build-tools --version=14.0.25420.1 --ignore-dependencies -y --params "'/IncludeRequired'"
+          echo ::set-env name=VCTargetsPath::'C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\v140'
+
+      - name: Install dependencies
+        run: apm install
+
+      - name: Run tests
+        run: apm test
+
+  Skip:
+    if: contains(github.event.head_commit.message, '[skip ci]')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Skip CI 🚫
+        run: echo skip ci

.travis.yml

@@ -1,6 +1,5 @@
 # Python language support in Atom
-[![macOS Build Status](https://travis-ci.org/atom/language-python.svg?branch=master)](https://travis-ci.org/atom/language-python)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/hmxrb9jttjh41es9/branch/master?svg=true)](https://ci.appveyor.com/project/Atom/language-python/branch/master)
+![ci](https://github.com/atom/language-python/workflows/ci/badge.svg)
 [![Dependency Status](https://david-dm.org/atom/language-python.svg)](https://david-dm.org/atom/language-python)
 
 Adds syntax highlighting and snippets to Python files in Atom.

README.md

@@ -1,29 +1,6 @@
-version: "{build}"
-
-image: Visual Studio 2015
-
-platform: x64
+# empty appveyor
+build: off
 
 branches:
-    only:
-      - master
-
-clone_depth: 10
-
-skip_tags: true
-
-environment:
-  APM_TEST_PACKAGES:
-
-  matrix:
-  - ATOM_CHANNEL: stable
-  - ATOM_CHANNEL: beta
-
-install:
-  - ps: Install-Product node 4
-
-build_script:
-  - ps: iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/atom/ci/master/build-package.ps1'))
-
-test: off
-deploy: off
+  only:
+  - non-existing

appveyor.yml

@@ -1643,7 +1643,7 @@
         'name': 'string.quoted.double.block.python'
         'patterns': [
           {
-             'begin': '(?=\\s*(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|WITH))'
+             'begin': '(?=\\s*(SELECT|INSERT|UPDATE|DELETE(?! \/)|CREATE|REPLACE|ALTER|WITH))'
              'name': 'meta.embedded.sql'
              'end': '(?=\\s*""")'
              'patterns': [
@@ -1655,7 +1655,7 @@
         ]
       }
       {
-        'begin': '(")(?=\\s*(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|WITH))'
+        'begin': '(")(?=\\s*(SELECT|INSERT|UPDATE|DELETE(?! \/)|CREATE|REPLACE|ALTER|WITH))'
         'beginCaptures':
           '1':
             'name': 'punctuation.definition.string.begin.python'
@@ -2214,7 +2214,7 @@
         'name': 'string.quoted.single.block.python'
         'patterns': [
           {
-             'begin': '(?=\\s*(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|WITH))'
+             'begin': '(?=\\s*(SELECT|INSERT|UPDATE|DELETE(?! \/)|CREATE|REPLACE|ALTER|WITH))'
              'end': '(?=\\s*\'\'\')'
              'name': 'meta.embedded.sql'
              'patterns': [
@@ -2226,7 +2226,7 @@
         ]
       }
       {
-        'begin': '(\')(?=\\s*(SELECT|INSERT|UPDATE|DELETE|CREATE|REPLACE|ALTER|WITH))'
+        'begin': '(\')(?=\\s*(SELECT|INSERT|UPDATE|DELETE(?! \/)|CREATE|REPLACE|ALTER|WITH))'
         'beginCaptures':
           '1':
             'name': 'punctuation.definition.string.begin.python'

grammars/python.cson

@@ -750,3 +750,10 @@ describe "Python grammar", ->
       expect(tokens[13]).toEqual value: ')', scopes: ['source.python', 'string.quoted.double.single-line.sql.python', 'meta.embedded.sql', 'punctuation.definition.section.bracket.round.end.sql']
       expect(tokens[15]).toEqual value: '"', scopes: ['source.python', 'string.quoted.double.single-line.sql.python', 'punctuation.definition.string.end.python']
       expect(tokens[17]).toEqual value: '%', scopes: ['source.python', 'keyword.operator.arithmetic.python']
+
+    it "recognizes DELETE as an HTTP method", ->
+      {tokens} = grammar.tokenizeLine('"DELETE /api/v1/endpoint"')
+
+      expect(tokens[0]).toEqual value: '"', scopes: ['source.python', 'string.quoted.double.single-line.python', 'punctuation.definition.string.begin.python']
+      expect(tokens[1]).toEqual value: 'DELETE /api/v1/endpoint', scopes: ['source.python', 'string.quoted.double.single-line.python']
+      expect(tokens[2]).toEqual value: '"', scopes: ['source.python', 'string.quoted.double.single-line.python', 'punctuation.definition.string.end.python']