Skip to content

Commit 6ab4ca4

Browse files
author
Wliu
authored
Merge branch 'master' into Fank-patch-1
2 parents 9eb9cb1 + 4eea63c commit 6ab4ca4

40 files changed

+2036
-1676
lines changed

‎apm/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@
66
"url": "https://github.com/atom/atom.git"
77
},
88
"dependencies": {
9-
"atom-package-manager": "1.18.8"
9+
"atom-package-manager": "1.18.10"
1010
}
1111
}

‎keymaps/darwin.cson

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@
132132
'ctrl-shift-w': 'editor:select-word'
133133
'cmd-ctrl-left': 'editor:move-selection-left'
134134
'cmd-ctrl-right': 'editor:move-selection-right'
135+
'cmd-shift-V': 'editor:paste-without-reformatting'
135136

136137
# Emacs
137138
'alt-f': 'editor:move-to-end-of-word'

‎keymaps/linux.cson

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
'alt-shift-right': 'editor:select-to-next-subword-boundary'
106106
'alt-backspace': 'editor:delete-to-beginning-of-subword'
107107
'alt-delete': 'editor:delete-to-end-of-subword'
108+
'ctrl-shift-V': 'editor:paste-without-reformatting'
108109

109110
# Sublime Parity
110111
'ctrl-a': 'core:select-all'

‎keymaps/win32.cson

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@
110110
'alt-shift-right': 'editor:select-to-next-subword-boundary'
111111
'alt-backspace': 'editor:delete-to-beginning-of-subword'
112112
'alt-delete': 'editor:delete-to-end-of-subword'
113+
'ctrl-shift-V': 'editor:paste-without-reformatting'
113114

114115
# Sublime Parity
115116
'ctrl-a': 'core:select-all'

‎menus/darwin.cson

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
{ label: 'Copy', command: 'core:copy' }
6666
{ label: 'Copy Path', command: 'editor:copy-path' }
6767
{ label: 'Paste', command: 'core:paste' }
68+
{ label: 'Paste Without Reformatting', command: 'editor:paste-without-reformatting' }
6869
{ label: 'Select All', command: 'core:select-all' }
6970
{ type: 'separator' }
7071
{ label: 'Toggle Comments', command: 'editor:toggle-line-comments' }

‎menus/linux.cson

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
{ label: 'C&opy', command: 'core:copy' }
3939
{ label: 'Copy Pat&h', command: 'editor:copy-path' }
4040
{ label: '&Paste', command: 'core:paste' }
41+
{ label: 'Paste Without Reformatting', command: 'editor:paste-without-reformatting' }
4142
{ label: 'Select &All', command: 'core:select-all' }
4243
{ type: 'separator' }
4344
{ label: '&Toggle Comments', command: 'editor:toggle-line-comments' }

‎menus/win32.cson

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
{ label: '&Copy', command: 'core:copy' }
4747
{ label: 'Copy Pat&h', command: 'editor:copy-path' }
4848
{ label: '&Paste', command: 'core:paste' }
49+
{ label: 'Paste Without Reformatting', command: 'editor:paste-without-reformatting' }
4950
{ label: 'Select &All', command: 'core:select-all' }
5051
{ type: 'separator' }
5152
{ label: '&Toggle Comments', command: 'editor:toggle-line-comments' }

‎package.json

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,25 @@
1414
"license": "MIT",
1515
"electronVersion": "1.6.15",
1616
"dependencies": {
17+
"@atom/nsfw": "^1.0.18",
1718
"@atom/source-map-support": "^0.3.4",
1819
"async": "0.2.6",
19-
"atom-keymap": "8.2.7",
20+
"atom-keymap": "8.2.8",
2021
"atom-select-list": "^0.1.0",
2122
"atom-ui": "0.4.1",
2223
"babel-core": "5.8.38",
2324
"cached-run-in-this-context": "0.4.1",
2425
"chai": "3.5.0",
2526
"chart.js": "^2.3.0",
2627
"clear-cut": "^2.0.2",
27-
"coffee-script": "1.11.1",
28+
"coffee-script": "1.12.7",
2829
"color": "^0.7.3",
29-
"dedent": "^0.6.0",
30+
"dedent": "^0.7.0",
3031
"devtron": "1.3.0",
3132
"etch": "^0.12.6",
3233
"event-kit": "^2.4.0",
3334
"find-parent-dir": "^0.3.0",
34-
"first-mate": "7.0.9",
35+
"first-mate": "7.1.0",
3536
"focus-trap": "^2.3.0",
3637
"fs-admin": "^0.1.6",
3738
"fs-plus": "^3.0.1",
@@ -53,7 +54,6 @@
5354
"mocha-multi-reporters": "^1.1.4",
5455
"mock-spawn": "^0.2.6",
5556
"normalize-package-data": "^2.0.0",
56-
"nsfw": "^1.0.15",
5757
"nslog": "^3",
5858
"oniguruma": "6.2.1",
5959
"pathwatcher": "8.0.1",
@@ -65,12 +65,12 @@
6565
"scandal": "^3.1.0",
6666
"scoped-property-store": "^0.17.0",
6767
"scrollbar-style": "^3.2",
68-
"season": "^6.0.1",
68+
"season": "^6.0.2",
6969
"semver": "^4.3.3",
7070
"service-hub": "^0.7.4",
7171
"sinon": "1.17.4",
7272
"temp": "^0.8.3",
73-
"text-buffer": "13.5.7",
73+
"text-buffer": "13.7.1",
7474
"typescript-simple": "1.0.0",
7575
"underscore-plus": "^1.6.6",
7676
"winreg": "^1.2.1",
@@ -91,10 +91,10 @@
9191
"solarized-light-syntax": "1.1.2",
9292
"about": "1.7.8",
9393
"archive-view": "0.63.4",
94-
"autocomplete-atom-api": "0.10.3",
95-
"autocomplete-css": "0.17.3",
96-
"autocomplete-html": "0.8.2",
97-
"autocomplete-plus": "2.36.8",
94+
"autocomplete-atom-api": "0.10.5",
95+
"autocomplete-css": "0.17.4",
96+
"autocomplete-html": "0.8.3",
97+
"autocomplete-plus": "2.37.2",
9898
"autocomplete-snippets": "1.11.2",
9999
"autoflow": "0.29.0",
100100
"autosave": "0.24.6",
@@ -112,63 +112,63 @@
112112
"github": "0.7.0",
113113
"git-diff": "1.3.6",
114114
"go-to-line": "0.32.1",
115-
"grammar-selector": "0.49.6",
115+
"grammar-selector": "0.49.8",
116116
"image-view": "0.62.4",
117117
"incompatible-packages": "0.27.3",
118118
"keybinding-resolver": "0.38.0",
119119
"line-ending-selector": "0.7.4",
120120
"link": "0.31.3",
121-
"markdown-preview": "0.159.15",
121+
"markdown-preview": "0.159.17",
122122
"metrics": "1.2.6",
123123
"notifications": "0.69.2",
124124
"open-on-github": "1.2.1",
125125
"package-generator": "1.1.1",
126-
"settings-view": "0.252.0",
127-
"snippets": "1.1.5",
126+
"settings-view": "0.252.2",
127+
"snippets": "1.1.7",
128128
"spell-check": "0.72.3",
129-
"status-bar": "1.8.13",
130-
"styleguide": "0.49.7",
129+
"status-bar": "1.8.14",
130+
"styleguide": "0.49.8",
131131
"symbols-view": "0.118.1",
132132
"tabs": "0.108.0",
133133
"timecop": "0.36.0",
134-
"tree-view": "0.220.0",
134+
"tree-view": "0.221.0",
135135
"update-package-dependencies": "0.12.0",
136136
"welcome": "0.36.5",
137137
"whitespace": "0.37.4",
138138
"wrap-guide": "0.40.2",
139139
"language-c": "0.58.1",
140140
"language-clojure": "0.22.4",
141-
"language-coffee-script": "0.49.1",
141+
"language-coffee-script": "0.49.2",
142142
"language-csharp": "0.14.3",
143-
"language-css": "0.42.6",
144-
"language-gfm": "0.90.1",
143+
"language-css": "0.42.7",
144+
"language-gfm": "0.90.2",
145145
"language-git": "0.19.1",
146-
"language-go": "0.44.2",
147-
"language-html": "0.48.1",
148-
"language-hyperlink": "0.16.2",
149-
"language-java": "0.27.4",
150-
"language-javascript": "0.127.5",
146+
"language-go": "0.44.3",
147+
"language-html": "0.48.2",
148+
"language-hyperlink": "0.16.3",
149+
"language-java": "0.27.5",
150+
"language-javascript": "0.127.6",
151151
"language-json": "0.19.1",
152-
"language-less": "0.33.0",
152+
"language-less": "0.34.0",
153153
"language-make": "0.22.3",
154-
"language-mustache": "0.14.3",
154+
"language-mustache": "0.14.4",
155155
"language-objective-c": "0.15.1",
156156
"language-perl": "0.38.1",
157-
"language-php": "0.42.1",
157+
"language-php": "0.42.2",
158158
"language-property-list": "0.9.1",
159-
"language-python": "0.45.4",
160-
"language-ruby": "0.71.3",
159+
"language-python": "0.45.5",
160+
"language-ruby": "0.71.4",
161161
"language-ruby-on-rails": "0.25.2",
162-
"language-sass": "0.61.1",
163-
"language-shellscript": "0.25.3",
162+
"language-sass": "0.61.2",
163+
"language-shellscript": "0.25.4",
164164
"language-source": "0.9.0",
165165
"language-sql": "0.25.8",
166166
"language-text": "0.7.3",
167-
"language-todo": "0.29.2",
167+
"language-todo": "0.29.3",
168168
"language-toml": "0.18.1",
169169
"language-typescript": "0.2.2",
170170
"language-xml": "0.35.2",
171-
"language-yaml": "0.31.0"
171+
"language-yaml": "0.31.1"
172172
},
173173
"private": true,
174174
"scripts": {

‎script/lib/generate-startup-snapshot.js

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,47 +27,37 @@ module.exports = function (packagedAppPath) {
2727
coreModules.has(modulePath) ||
2828
(relativePath.startsWith(path.join('..', 'src')) && relativePath.endsWith('-element.js')) ||
2929
relativePath.startsWith(path.join('..', 'node_modules', 'dugite')) ||
30+
relativePath.endsWith(path.join('node_modules', 'coffee-script', 'lib', 'coffee-script', 'register.js')) ||
31+
relativePath.endsWith(path.join('node_modules', 'fs-extra', 'lib', 'index.js')) ||
32+
relativePath.endsWith(path.join('node_modules', 'graceful-fs', 'graceful-fs.js')) ||
33+
relativePath.endsWith(path.join('node_modules', 'htmlparser2', 'lib', 'index.js')) ||
34+
relativePath.endsWith(path.join('node_modules', 'minimatch', 'minimatch.js')) ||
3035
relativePath === path.join('..', 'exports', 'atom.js') ||
3136
relativePath === path.join('..', 'src', 'electron-shims.js') ||
3237
relativePath === path.join('..', 'src', 'safe-clipboard.js') ||
3338
relativePath === path.join('..', 'node_modules', 'atom-keymap', 'lib', 'command-event.js') ||
3439
relativePath === path.join('..', 'node_modules', 'babel-core', 'index.js') ||
3540
relativePath === path.join('..', 'node_modules', 'cached-run-in-this-context', 'lib', 'main.js') ||
36-
relativePath === path.join('..', 'node_modules', 'coffee-script', 'lib', 'coffee-script', 'register.js') ||
37-
relativePath === path.join('..', 'node_modules', 'cson-parser', 'node_modules', 'coffee-script', 'lib', 'coffee-script', 'register.js') ||
3841
relativePath === path.join('..', 'node_modules', 'decompress-zip', 'lib', 'decompress-zip.js') ||
3942
relativePath === path.join('..', 'node_modules', 'debug', 'node.js') ||
40-
relativePath === path.join('..', 'node_modules', 'fs-extra', 'lib', 'index.js') ||
41-
relativePath === path.join('..', 'node_modules', 'github', 'node_modules', 'fs-extra', 'lib', 'index.js') ||
4243
relativePath === path.join('..', 'node_modules', 'git-utils', 'src', 'git.js') ||
4344
relativePath === path.join('..', 'node_modules', 'glob', 'glob.js') ||
44-
relativePath === path.join('..', 'node_modules', 'graceful-fs', 'graceful-fs.js') ||
45-
relativePath === path.join('..', 'node_modules', 'htmlparser2', 'lib', 'index.js') ||
46-
relativePath === path.join('..', 'node_modules', 'markdown-preview', 'node_modules', 'htmlparser2', 'lib', 'index.js') ||
47-
relativePath === path.join('..', 'node_modules', 'roaster', 'node_modules', 'htmlparser2', 'lib', 'index.js') ||
48-
relativePath === path.join('..', 'node_modules', 'task-lists', 'node_modules', 'htmlparser2', 'lib', 'index.js') ||
4945
relativePath === path.join('..', 'node_modules', 'iconv-lite', 'lib', 'index.js') ||
5046
relativePath === path.join('..', 'node_modules', 'less', 'index.js') ||
5147
relativePath === path.join('..', 'node_modules', 'less', 'lib', 'less', 'fs.js') ||
5248
relativePath === path.join('..', 'node_modules', 'less', 'lib', 'less-node', 'index.js') ||
53-
relativePath === path.join('..', 'node_modules', 'less', 'node_modules', 'graceful-fs', 'graceful-fs.js') ||
54-
relativePath === path.join('..', 'node_modules', 'minimatch', 'minimatch.js') ||
5549
relativePath === path.join('..', 'node_modules', 'node-fetch', 'lib', 'fetch-error.js') ||
56-
relativePath === path.join('..', 'node_modules', 'nsfw', 'node_modules', 'fs-extra', 'lib', 'index.js') ||
5750
relativePath === path.join('..', 'node_modules', 'superstring', 'index.js') ||
5851
relativePath === path.join('..', 'node_modules', 'oniguruma', 'src', 'oniguruma.js') ||
5952
relativePath === path.join('..', 'node_modules', 'request', 'index.js') ||
6053
relativePath === path.join('..', 'node_modules', 'resolve', 'index.js') ||
6154
relativePath === path.join('..', 'node_modules', 'resolve', 'lib', 'core.js') ||
62-
relativePath === path.join('..', 'node_modules', 'scandal', 'node_modules', 'minimatch', 'minimatch.js') ||
6355
relativePath === path.join('..', 'node_modules', 'settings-view', 'node_modules', 'glob', 'glob.js') ||
64-
relativePath === path.join('..', 'node_modules', 'settings-view', 'node_modules', 'minimatch', 'minimatch.js') ||
6556
relativePath === path.join('..', 'node_modules', 'spellchecker', 'lib', 'spellchecker.js') ||
6657
relativePath === path.join('..', 'node_modules', 'spelling-manager', 'node_modules', 'natural', 'lib', 'natural', 'index.js') ||
6758
relativePath === path.join('..', 'node_modules', 'tar', 'tar.js') ||
6859
relativePath === path.join('..', 'node_modules', 'temp', 'lib', 'temp.js') ||
69-
relativePath === path.join('..', 'node_modules', 'tmp', 'lib', 'tmp.js') ||
70-
relativePath === path.join('..', 'node_modules', 'tree-view', 'node_modules', 'minimatch', 'minimatch.js')
60+
relativePath === path.join('..', 'node_modules', 'tmp', 'lib', 'tmp.js')
7161
)
7262
}
7363
}).then((snapshotScript) => {

‎spec/fixtures/packages/package-with-rb-filetype/grammars/rb.cson

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
'name': 'Test Ruby'
22
'scopeName': 'test.rb'
3+
'firstLineMatch': '^\\#!.*(?:\\s|\\/)(?:testruby)(?:$|\\s)'
34
'fileTypes': [
45
'rb'
56
]

‎spec/grammars-spec.coffee

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ describe "the `grammars` global", ->
120120
atom.grammars.grammarForScopeName('source.ruby').bundledPackage = true
121121
atom.grammars.grammarForScopeName('test.rb').bundledPackage = false
122122

123+
expect(atom.grammars.selectGrammar('test.rb', '#!/usr/bin/env ruby').scopeName).toBe 'source.ruby'
124+
expect(atom.grammars.selectGrammar('test.rb', '#!/usr/bin/env testruby').scopeName).toBe 'test.rb'
123125
expect(atom.grammars.selectGrammar('test.rb').scopeName).toBe 'test.rb'
124126

125127
describe "when there is no file path", ->

‎spec/selection-spec.coffee

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,11 @@ describe "Selection", ->
103103
selection.insertText("\r\n", autoIndent: true)
104104
expect(buffer.lineForRow(2)).toBe " "
105105

106+
it "does not adjust the indent of trailing lines if preserveTrailingLineIndentation is true", ->
107+
selection.setBufferRange [[5, 0], [5, 0]]
108+
selection.insertText(' foo\n bar\n', preserveTrailingLineIndentation: true, indentBasis: 1)
109+
expect(buffer.lineForRow(6)).toBe(' bar')
110+
106111
describe ".fold()", ->
107112
it "folds the buffer range spanned by the selection", ->
108113
selection.setBufferRange([[0, 3], [1, 6]])

‎spec/spec-helper.coffee

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ if specPackagePath = FindParentDir.sync(testPaths[0], 'package.json')
5858
if specDirectory = FindParentDir.sync(testPaths[0], 'fixtures')
5959
specProjectPath = path.join(specDirectory, 'fixtures')
6060
else
61-
specProjectPath = path.join(__dirname, 'fixtures')
61+
specProjectPath = require('os').tmpdir()
6262

6363
beforeEach ->
6464
atom.project.setPaths([specProjectPath])

‎spec/text-editor-component-spec.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,8 @@ describe('TextEditorComponent', () => {
18961896
const decoration = editor.decorateMarker(marker, {type: 'overlay', item: overlayElement, class: 'a'})
18971897
await component.getNextUpdatePromise()
18981898

1899+
const overlayComponent = component.overlayComponents.values().next().value
1900+
18991901
const overlayWrapper = overlayElement.parentElement
19001902
expect(overlayWrapper.classList.contains('a')).toBe(true)
19011903
expect(overlayWrapper.getBoundingClientRect().top).toBe(clientTopForLine(component, 5))
@@ -1926,12 +1928,12 @@ describe('TextEditorComponent', () => {
19261928
await setScrollTop(component, 20)
19271929
expect(overlayWrapper.getBoundingClientRect().top).toBe(clientTopForLine(component, 5))
19281930
overlayElement.style.height = 60 + 'px'
1929-
await component.getNextUpdatePromise()
1931+
await overlayComponent.getNextUpdatePromise()
19301932
expect(overlayWrapper.getBoundingClientRect().bottom).toBe(clientTopForLine(component, 4))
19311933

19321934
// Does not flip the overlay vertically if it would overflow the top of the window
19331935
overlayElement.style.height = 80 + 'px'
1934-
await component.getNextUpdatePromise()
1936+
await overlayComponent.getNextUpdatePromise()
19351937
expect(overlayWrapper.getBoundingClientRect().top).toBe(clientTopForLine(component, 5))
19361938

19371939
// Can update overlay wrapper class

0 commit comments

Comments
 (0)