Skip to content

Commit 45f9deb

Browse files
committed
Move keyword comments to docstrings
1 parent 87b7b07 commit 45f9deb

File tree

1 file changed

+43
-43
lines changed

1 file changed

+43
-43
lines changed

swift-mode-font-lock.el

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,15 @@ Return nil otherwise."
5757
;; Keywords
5858
;; https://developer.apple.com/library/ios/documentation/Swift/Conceptual/Swift_Programming_Language/LexicalStructure.html#//apple_ref/doc/uid/TP40014097-CH30-ID410
5959

60-
;; Member functions in the standard library in Swift 3 which may be used
61-
;; with trailing closures and no parentheses.
6260
(defconst swift-mode:member-functions-trailing-closure
6361
'("sort" "sorted" "split" "contains" "index" "partition" "filter" "first"
6462
"forEach" "flatMap" "withMutableCharacters" "withCString"
6563
"withUnsafeMutableBufferPointer" "withUnsafeMutablePointers"
6664
"withUnsafeMutablePointerToElements" "withUnsafeMutablePointerToHeader"
67-
"withUnsafeBufferPointer" "withUTF8Buffer" "min" "map" "max"))
65+
"withUnsafeBufferPointer" "withUTF8Buffer" "min" "map" "max")
66+
"Member functions in the standard library in Swift 3 which may be used
67+
with trailing closures and no parentheses.")
6868

69-
;; Member functions in the standard library in Swift 3.
7069
(defconst swift-mode:member-functions
7170
'("symmetricDifference" "storeBytes" "starts" "stride" "sortInPlace"
7271
"successor" "suffix" "subtract" "subtracting" "subtractInPlace"
@@ -108,14 +107,14 @@ Return nil otherwise."
108107
"moveInitializeBackwardFrom" "moveInitializeFrom" "moveAssign"
109108
"moveAssignFrom" "multiply" "multiplyWithOverflow" "multiplied" "measure"
110109
"makeIterator" "makeDescription" "maximum" "maximumMagnitude" "maxElement"
111-
"bindMemory"))
110+
"bindMemory")
111+
"Member functions in the standard library in Swift 3.")
112112

113-
;; Global functions available in Swift 3 which may be used with trailing
114-
;; closures and no parentheses.
115113
(defconst swift-mode:global-functions-trailing-closure
116-
'("anyGenerator" "autoreleasepool"))
114+
'("anyGenerator" "autoreleasepool")
115+
"Global functions available in Swift 3 which may be used with trailing
116+
closures and no parentheses.")
117117

118-
;; Global functions available in Swift 3.
119118
(defconst swift-mode:global-functions
120119
'("stride" "strideof" "strideofValue" "sizeof" "sizeofValue" "sequence" "swap"
121120
"numericCast" "transcode" "isUniquelyReferenced"
@@ -124,13 +123,13 @@ Return nil otherwise."
124123
"unsafeAddressOf" "print" "precondition" "preconditionFailure" "fatalError"
125124
"withUnsafeMutablePointer" "withUnsafePointer" "withExtendedLifetime"
126125
"withVaList" "assert" "assertionFailure" "alignof" "alignofValue" "abs"
127-
"repeatElement" "readLine" "getVaList" "min" "max"))
126+
"repeatElement" "readLine" "getVaList" "min" "max")
127+
"Global functions available in Swift 3.")
128128

129-
;; Properties in the standard library in Swift 3.
130129
(defconst swift-mode:process-properties
131-
'("arguments" "argc" "unsafeArgv"))
130+
'("arguments" "argc" "unsafeArgv")
131+
"Properties in the standard library in Swift 3.")
132132

133-
;; Properties in the standard library in Swift 3.
134133
(defconst swift-mode:properties
135134
'("startIndex" "stringValue" "stride" "size" "sign" "signBitIndex"
136135
"significand" "significandBitCount" "significandBitPattern"
@@ -151,10 +150,9 @@ Return nil otherwise."
151150
"leastNormalMagnitude" "last" "lazy" "alignment" "allocatedElementCount"
152151
"allZeros" "array" "arrayPropertyIsNativeTypeChecked" "radix" "rawValue"
153152
"greatestFiniteMagnitude" "min" "memory" "max" "byteSize" "byteSwapped"
154-
"binade" "bitPattern" "bigEndian" "buffer" "base" "baseAddress"))
153+
"binade" "bitPattern" "bigEndian" "buffer" "base" "baseAddress")
154+
"Properties in the standard library in Swift 3.")
155155

156-
;; Enum cases in the standard library - note that there is some overlap between
157-
;; these and the properties
158156
(defconst swift-mode:enum-cases
159157
'("scalarValue" "size" "signalingNaN" "sound" "some" "suppressed" "sprite"
160158
"set" "none" "negativeSubnormal" "negativeNormal" "negativeInfinity"
@@ -164,18 +162,19 @@ Return nil otherwise."
164162
"positiveSubnormal" "positiveNormal" "positiveInfinity" "positiveZero"
165163
"point" "plus" "error" "emptyInput" "view" "quietNaN" "float"
166164
"attributedString" "awayFromZero" "rectangle" "range" "generated" "minus"
167-
"bool" "bezierPath"))
165+
"bool" "bezierPath")
166+
"Enum cases in the standard library - note that there is some overlap
167+
between these and the properties")
168168

169-
;; Enum types in the standard library in Swift 3.
170169
(defconst swift-mode:enum-types
171170
'("ImplicitlyUnwrappedOptional" "Representation" "MemoryLayout"
172171
"FloatingPointClassification" "SetIndexRepresentation"
173172
"SetIteratorRepresentation" "FloatingPointRoundingRule"
174173
"UnicodeDecodingResult" "Optional" "DictionaryIndexRepresentation"
175174
"AncestorRepresentation" "DisplayStyle" "PlaygroundQuickLook" "Never"
176-
"FloatingPointSign" "Bit" "DictionaryIteratorRepresentation"))
175+
"FloatingPointSign" "Bit" "DictionaryIteratorRepresentation")
176+
"Enum types in the standard library in Swift 3.")
177177

178-
;; Protocols in the standard library in Swift 3.
179178
(defconst swift-mode:protocols
180179
'("RandomAccessCollection" "RandomAccessIndexable"
181180
"RangeReplaceableCollection" "RangeReplaceableIndexable" "RawRepresentable"
@@ -194,9 +193,9 @@ Return nil otherwise."
194193
"ExpressibleByExtendedGraphemeClusterLiteral" "ExpressibleByFloatLiteral"
195194
"ExpressibleByArrayLiteral" "FloatingPoint" "LosslessStringConvertible"
196195
"LazySequenceProtocol" "LazyCollectionProtocol" "AnyObject"
197-
"AbsoluteValuable"))
196+
"AbsoluteValuable")
197+
"Protocols in the standard library in Swift 3.")
198198

199-
;; Structs in the standard library in Swift 2 only.
200199
(defconst swift-mode:structs
201200
'("Repeat" "Repeated" "ReversedRandomAccessCollection"
202201
"ReversedRandomAccessIndex" "ReversedCollection" "ReversedIndex"
@@ -237,9 +236,9 @@ Return nil otherwise."
237236
"LazyFilterCollection" "LazyFilterIndex" "LazyFilterIterator"
238237
"AnyRandomAccessCollection" "AnyGenerator" "AnyBidirectionalCollection"
239238
"AnySequence" "AnyHashable" "AnyCollection" "AnyIndex" "AnyIterator"
240-
"AutoreleasingUnsafeMutablePointer" "Array" "ArraySlice"))
239+
"AutoreleasingUnsafeMutablePointer" "Array" "ArraySlice")
240+
"Structs in the standard library in Swift 3.")
241241

242-
;; Typealiases in the standard library in Swift 3.
243242
(defconst swift-mode:typealiases
244243
'("RawSignificand" "RawExponent" "RawValue" "BooleanLiteralType" "Buffer"
245244
"Base" "Storage" "StringLiteralType" "Stride" "Stream1" "Stream2"
@@ -252,17 +251,18 @@ Return nil otherwise."
252251
"UnicodeScalarLiteralType" "UnfoldFirstSequence" "UTF16Index" "UTF16View"
253252
"UTF8Index" "UIntMax" "Element" "Elements" "ExtendedGraphemeClusterType"
254253
"ExtendedGraphemeClusterLiteralType" "Exponent" "Void" "Value" "Key"
255-
"Float32" "FloatLiteralType" "Float64" "AnyClass" "Any"))
254+
"Float32" "FloatLiteralType" "Float64" "AnyClass" "Any")
255+
"Typealiases in the standard library in Swift 3.")
256256

257-
;; Built-in class types.
258257
(defconst swift-mode:class-types
259-
'("ManagedBuffer" "ManagedProtoBuffer" "NonObjectiveCBase" "AnyGenerator"))
258+
'("ManagedBuffer" "ManagedProtoBuffer" "NonObjectiveCBase" "AnyGenerator")
259+
"Built-in class types.")
260260

261-
;; Precedence groups in the standard library.
262261
(defconst swift-mode:precedence-groups
263262
'("BitwiseShift" "Assignment" "RangeFormation" "Casting" "Addition"
264263
"NilCoalescing" "Comparison" "LogicalConjunction" "LogicalDisjunction"
265-
"Default" "Ternary" "Multiplication" "FunctionArrow"))
264+
"Default" "Ternary" "Multiplication" "FunctionArrow")
265+
"Precedence groups in the standard library.")
266266

267267
(defconst swift-mode:constant-keywords
268268
'(
@@ -271,43 +271,43 @@ Return nil otherwise."
271271
"CommandLine" "Process"
272272
;; The return type of a function that never returns.
273273
"Never")
274-
)
274+
"Keywords used as constants.")
275275

276-
;; Keywords that begin with a number sign (#).
277276
(defconst swift-mode:preprocessor-keywords
278277
'("#available" "#colorLiteral" "#column" "#else" "#elseif" "#endif"
279278
"#fileLiteral" "#file" "#function" "#if" "#imageLiteral" "#keypath" "#line"
280-
"#selector" "#sourceLocation"))
279+
"#selector" "#sourceLocation")
280+
"Keywords that begin with a number sign (#).")
281281

282-
;; Keywords used in declarations.
283282
(defconst swift-mode:declaration-keywords
284283
'("associatedtype" "class" "deinit" "enum" "extension" "fileprivate" "func"
285284
"import" "init" "inout" "internal" "let" "open" "operator" "private"
286-
"protocol" "public" "static" "struct" "subscript" "typealias" "var"))
285+
"protocol" "public" "static" "struct" "subscript" "typealias" "var")
286+
"Keywords used in declarations.")
287287

288-
;; Keywords used in statements.
289288
(defconst swift-mode:statement-keywords
290289
'("break" "case" "continue" "default" "defer" "do" "else" "fallthrough" "for"
291-
"guard" "if" "in" "repeat" "return" "switch" "where" "while"))
290+
"guard" "if" "in" "repeat" "return" "switch" "where" "while")
291+
"Keywords used in statements.")
292292

293-
;; Keywords used in expressions and types (without true, false, and keywords
294-
;; begin with a number sign)
295293
(defconst swift-mode:expression-keywords
296294
'("as" "catch" "dynamicType" "is" "rethrows" "super" "self" "Self" "throws"
297-
"throw" "try"))
295+
"throw" "try")
296+
"Keywords used in expressions and types (without true, false, and
297+
keywords begin with a number sign)")
298298

299-
;; Keywords reserved in particular contexts.
300299
(defconst swift-mode:context-keywords
301300
'("Protocol" "Type" "and" "assignment" "associativity" "convenience" "didSet"
302301
"dynamic" "final" "get" "higherThan" "indirect" "infix" "lazy" "left"
303302
"lowerThan" "mutating" "none" "nonmutating" "optional" "override" "postfix"
304303
"precedence" "precedencegroup" "prefix" "required" "right" "set" "unowned"
305-
"weak" "willSet"))
304+
"weak" "willSet")
305+
"Keywords reserved in particular contexts.")
306306

307-
;; Keywords for build configuration statements.
308307
(defconst swift-mode:build-config-keywords
309308
'("os" "arch" "swift" "OSX" "iOS" "watchOS" "tvOS" "i386" "x86_64" "arm"
310-
"arm64" "iOSApplicationExtension" "OSXApplicationExtension"))
309+
"arm64" "iOSApplicationExtension" "OSXApplicationExtension")
310+
"Keywords for build configuration statements.")
311311

312312
(defconst swift-mode:font-lock-keywords
313313
`(

0 commit comments

Comments
 (0)